My change 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	MyGit/src/co/MyMain.java