Merge pull request #20 from dcgudeman/master

Fixed balance
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
minor fix to photo upload page
updated ReadMe
fixed upload redirect
Merge branch 'master' of https://github.com/ikitha/Project_2