Redo login, change database record to work with friend better, and test login + registration
Merge remote-tracking branch 'origin/master' into heroku