fixes bugs in login form
fixes merge conflicts
Merge branch 'development' of https://github.com/case-eee/typing-trainer into auth