upload-photo
Merge branch 'master' into upload-photo

Conflicts:
	db/schema.rb
Merge pull request #9 from juliendebray/upload-photo

upload-photo
manage routes conflicts