database seeding
Merge branch 'master' of https://github.com/Enulis/HakunaMatata

Conflicts:
	app/controllers/sessions_controller.rb