end of sunday commit
Merge branch 'master' into new_user_story

Conflicts:
	app/views/layouts/application.html.erb
Merge branch 'new_user_story'