initial commit
Merge https://github.com/patrickherrod/AndroidApp