Added most of user functionality
Merge branch 'master' into User
Merge pull request #4 from Mikedgs/User

User