Finalised user auth
Merge upstream
Merge pull request #2 from hazanjon/master

Finished User Auth