commit 1
commit 1
commit 1
Merge branch '1' into m

Conflicts:
	app/src/main/java/com/ali/corp/myapplication/MyActivity.java