no message
Merge remote-tracking branch 'origin/feature/canvasShip'
Merge branch 'master' into feature/canvasShip

Conflicts:
	SRonline.iml
	target/classes/main/Main.class