r324r32
Merge branch 'master' of https://github.com/godiciel/GitHubGodiciel

Conflicts:
	Android/MyAndroidGit/src/com/example/myandroidgit/MainActivity.java