666
Merge branch 'master' of git@github.com:wisegps/TestApp.git

Conflicts:
	src/your/honesty/testapp/TestGitActivity.java