borre la vista y el general.js
Merge branch 'master' of https://github.com/No6things/ATICOMPANY

Conflicts:
	source/hermes/app/assets/javascripts/general.js
	source/hermes/app/views/home/index.html.erb
	source/hermes/config/routes.rb
dix