Merge branch 'projects-pages'

Conflicts:
	app/about.html
	app/index.html
	app/projects.html
	app/styles/main.scss