Ultimos cambios, Allan
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
	config/routes.rb
	db/development.sqlite3
	db/schema.rb
	log/development.log