passing all controller tests
Merge branch 'users-controller' of github.com:sam-strong/twillex into users-controller