added users controller
Merge branch 'eloera'