rearranged code, added comments
Merge branch 'master' of github.com:will-quast/android-location-demo