First Commit
Merge https://github.com/adam0982/testAndroidProject
Merging