n progress
Merge branch 'master' of github.com:halmayne/chumpr
login working
Merge branch 'master' of github.com:halmayne/chumpr