layout css
layout css
Merge branch 'master' of https://github.com/cosc617g4/project

Conflicts:
	app/views/home/index.html.erb
	app/views/photos/index.html.erb