Error2
Merge branch 'master' of https://github.com/smonsalve/oe

Conflicts:
	app/models/photo.rb