modal paquete
Merge branch 'master' of https://github.com/No6things/ATICOMPANY

Conflicts:
	source/hermes/app/controllers/home_controller.rb
	source/hermes/app/views/home/index.html.erb