test 2
test update
Merge branch 'master' of https://github.com/luitgy/TestGIT.git

Conflicts:
	src/com/example/testgit/MainActivity.java
e