fixed users controller merge problems
Merge pull request #40 from Noahhh/master

fixed users controller merge problems