Working on User and tests
Merge branch 'master' of github.com:igpay/pokes