fixed all photos page and put in block for editing users
Merge branch 'master' of https://github.com/ikitha/Project_2

Conflicts:
	app/views/photos/show.html.erb