normalize
Merge branch 'master' of github.com:LeeHampton/group_project_1

Conflicts:
	app/views/partials/_nav.html.haml