ergr
Merge remote-tracking branch 'origin/master'

Conflicts:
	MyProject/src/my/silly/pack/MyNewClass.java