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

Conflicts:
	source/hermes/app/controllers/password_controller.rb