update
Merge branch 'master' of github.com:daniel1bell/PhotoSharing

Conflicts:
	app/views/pictures/show.html.haml