merging users after login

when logging in while logged in as unregistered user the two users are merged
Merge branch 'master' of https://github.com/CrazyCrud/shithouse_poetry