added basic user and match handling
Merge remote-tracking branch 'origin' into ashray
Merge branch 'master' of https://github.com/inkdot/justap