stuff
stuff
Merge branch 'master' of https://github.com/Gargamel1989/Seasoning.git

Conflicts:
	Seasoning/recipes/templates/recipes/browse_recipes.html