fixed merge conflict
fixed conflict
Merge branch 'refs/heads/laura'
Merge branch 'master' of https://github.com/cemmanuel1/DBCFinalProject

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