change password up
merging gemfile.lock
Merge branch 'master' of https://github.com/Arvoreniad/CA