.
Merge branch 'master' of github.com:Pepito-Manaloto/Android-The-Big-Nerd-Ranch

Conflicts:
	HelloMoon/AndroidManifest.xml
263