Update index.html
Update foundation.css
Update index.html
Merge branch 'gh-pages'

Conflicts:
	css/app.css
	index.html
Merge branch 'master' of https://github.com/PHIConflictAssignment/Conflict

Conflicts:
	css/foundation.css
	index.html
fixed some issues
Merge branch 'master' into gh-pages
ok still trying to get this to work