updated to include username in database
Merge branch 'master' of https://github.com/louis-schiff/doorstop