deleted stuff
Merge branch 'master' of github.com:jtwarren/progressive_auth_android
working stuff
final version
fix conflicts