1
Merge branch 'master' of https://github.com/hellocountryman/test.git

Conflicts:
	src/com/example/test/MainActivity.java