Why is this here?
Remove some extra words
Merge branch 'master' of https://github.com/with-regard/regard-website

Conflicts:
	website/views/about.jade