add users controller
add new and create actions to users controller
add restful routes for users
fix Merchant related bug in users#create
fix merge conflict
Merge pull request #4 from rkeblitis/bri

Bri