initial commit
Merge branch 'master' of https://github.com/thomasfox13/android-stuff