WHAT?
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/inspectionProfiles/Project_Default.xml
	.idea/misc.xml
	.idea/workspace.xml
	out/production/Moldat/Action.class
	out/production/Moldat/GFrame.class
	out/production/Moldat/Moldat.class
	out/production/Moldat/Objects.class
	out/production/Moldat/Screen.class
	out/production/Moldat/Soldier.class
	src/Soldier.java