ajout alice
commit Alice
Merge branch 'master' of https://github.com/epaillous/frigoPlay

Conflicts:
	app/controllers/Application.java
	app/views/Application/index.html
	app/views/Application/recettes.html
	conf/routes
	public/stylesheets/main.css
merge alice
derniere tentative Alice