main css
fixed header css
Merge branch 'gh-pages' into change_template_for_the_modal

Conflicts:
	public/.tmp/css/main.css