reorganize view\main folder

update site.css
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/views/main/home.html
Merge branch 'master' of https://github.com/Derpessor96/EndToEndTeamEris