hm final tarde

dasse
Merge branch 'master' of http://github.com/JCosta/Cook

Conflicts:
	db/schema.rb