lots of stuff
Merge pull request #1 from borourke/feature/users

lots of stuff