changes
Merge branch 'theday' of github.com:tfrce/thedaywefightback into theday

Conflicts:
	css/home.css