fixed projects page
Merge branch 'master' into gh-pages

Conflicts:
	css/projects.css