commit
commit
Merge branch 'master' of https://github.com/atmaramt/Mine

Conflicts:
	TestGitProject/src/com/example/testgitproject/MainActivity.java
commit
commit
Merge branch 'master' of https://github.com/atmaramt/Mine