update controllers
Merge pull request #20 from toannguyenle/rails

update controllers
resolve users controller conflict