style_nova
Merge branch 'master' of github.com:JCosta/Cook
receita_ind
Merge branch 'master' of github.com:JCosta/Cook

Conflicts:
	app/assets/stylesheets/style.css.erb