change
Merge branch 'master' of https://github.com/aliamohsin/Android-Class

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