User auth
Fix conficts
Merge pull request #6 from rocketu/user_auth

User auth