WIP login
Merge branch 'master' of https://github.com/daveroberts/klein-test
WIP