added more User controllers
merged conflict
Merge pull request #13 from kelseyledford/users

Users