crear paquete listo
borre toda esa vaina
Merge github.com:No6things/ATICOMPANY

Conflicts:
	source/spa/tmp/cache/assets/development/sprockets/21a2063a976daf394983759cb443a7cc
	source/spa/tmp/cache/assets/development/sprockets/268fc8d914b620b386f2abcdf846085c
	source/spa/tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	source/spa/tmp/cache/assets/development/sprockets/75ec7f7ffb7e4baf0b4799c885ccec9f
	source/spa/tmp/cache/assets/development/sprockets/9c35e41a576b9946a39e620c90e79407
	source/spa/tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	source/spa/tmp/cache/assets/development/sprockets/d6bb8c79b5667def69f4301e7013628b
	source/spa/tmp/cache/assets/development/sprockets/ef138d704a3758fc361469159dc8ef10
	source/spa/tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655