jerem fait de la merde
Merge branch 'master' of https://github.com/emoc11/music_event

Conflicts:
	Gemfile.lock
	app/views/session/new.html.erb
	app/views/users/connexion.html.erb
	app/views/users/new.html.erb
Merge branch 'master' of https://github.com/emoc11/music_event