fix de gems que no funcionaban bien (rake)
Merge branch 'master' of https://github.com/lvalenzuela/starting-project

Conflicts:
	app/models/categoria.rb no se que esta pasando