Noah Moroze 14dd2f8e7a Fixed merge conflict		2014-09-23 20:09:57 -04:00
..
fa	removed useless styling	2014-07-28 01:38:48 -04:00
fonts	added fontawesome and modified css layout	2014-05-31 15:08:04 -04:00
style.css	Fixed merge conflict	2014-09-23 20:09:57 -04:00