Changing up some stuff
Merge branch 'gh-pages' of https://github.com/nemesisjoe/test into gh-pages

Conflicts:
	css/foundation.min.css