Login fixed done
Merge branch 'master' of github.com:kcjpop/emotionless