fix routes
add login fields to users
Merge branch 'master' of https://github.com/nielmalhotra/robot_rpg