start contact page
Merge branch 'master' of https://github.com/lukexwinter/bluestone-web

Conflicts:
	css/main.css
Merge commit
8-14-2014 commit