first commit
Merge branch 'master' of github.com:MikePenhall/my-first-android-app