implementando calculadora en modal de paquete
Merge branch 'master' of https://github.com/No6things/ATICOMPANY
Merge branch 'master' of https://github.com/No6things/ATICOMPANY
agregue meta
Merge branch 'master' of https://github.com/No6things/ATICOMPANY
huehue
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
	source/hermes/config/routes.rb