lets see if there is a conflict
Merge branch 'master' of https://github.com/sunpascal/git_test

Conflicts:
	GitTest/src/com/example/gittest/MainActivity.java