merge conflict removed
Merge branch 'master' of github.com:snebel/wdi_project_2

Conflicts:
	app/views/layouts/application.html.erb