Add java files
Merge branch 'master' of https://github.com/shanesarnac/androidApp
pull from git