Cambiado el modelo
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/cursoASPGems.iml
	.idea/vcs.xml
	.idea/workspace.xml
	Gemfile
	Gemfile.lock
	config/database.yml
	config/routes.rb
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/cursoASPGems.iml
	.idea/vcs.xml
	.idea/workspace.xml
	Gemfile
	Gemfile.lock
	config/database.yml
	config/routes.rb