issue on it
Merge remote-tracking branch 'origin/master'

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