Building Your First App
Merge branch 'master' of https://github.com/JohnnyChingas/MyFirstAndroidApp

The remote repo and local repo are different.