added about page content and contact link
Merge branch 'master' into about-us

Conflicts:
	app/styles/_custom.scss
	public/js/app.js
	public/js/app.js.map
Merge pull request #23 from marcnischan/about-us

About us