Merge pull request #27 from blind-squirrel/alex

Alex
Fixed login functionality