Merge pull request #17 from ferdythebull/master

user-auth