Merge branch 'master' of https://github.com/doombunny911/hbs

Conflicts:
	src/historicalbattlesimulatorbasic/CombatPanel.java
Merge branch 'master' of https://github.com/doombunny911/hbs