added text to subwindow in game
a
UnitDisplay
yes
Merge remote-tracking branch 'origin/Josh-Fix'

Conflicts:
	src/Wargame/Game.java

very spooky