Because branching
Merge branch 'master' of https://github.com/gardavi/CombatSim

Conflicts:
	src/main2/MainWindow.java