Cree el modelo orden de servicio con Scaffold
Conflictos bla bla bla

Conflicts:
	config/routes.rb
	db/development.sqlite3
	db/schema.rb
	log/development.log
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
Probando
Merge branch 'master' of github.com:Losmaspulentos/servideo

Conflicts:
	db/development.sqlite3
	log/development.log
Merge branch 'master' of github.com:Losmaspulentos/servideo

Conflicts:
	config/routes.rb
	db/development.sqlite3
	db/schema.rb
	log/development.log
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
Links listos
:D