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

Conflicts:
	source/hermes/config/routes.rb
huehu
Merge branch 'master' of https://github.com/No6things/ATICOMPANY

Conflicts:
	source/hermes/config/routes.rb