Ajout de Edit
Merge branch 'master' of https://github.com/emoc11/music_event

Conflicts:
	app/models/user.rb