OOPS
Added more stuff
Fix background color
Merge remote-tracking branch 'jack/master'

Conflicts:
	css/foundation.css
	css/main.css