Fix bug merge
Merge branch 'master' of https://github.com/Metali/AresProject
FIX this fucking login