fecho dia

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

Conflicts:
	db/schema.rb
tarde 5ªF

inicio trab tarde