lo
Merge remote-tracking branch 'origin/master'
lo
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/van/myapplication/MyActivity.java