More login stuff.
Merge branch 'stuff2'
Damn those branches.
Merge branch 'master' of https://github.com/unok-kun/HTFM
?