user login and register
merge conflict resolved
Merge pull request #24 from bchiatt/user

User