front end changes
Merge branch 'master' of https://github.com/msondheimer/web_dev_final

Conflicts:
	CONpetence/app/views/photos/photo.html.erb