fixed merge conflicts yo
Merge pull request #29 from Tmee/user

fixed merge conflicts yo