Include 3rd set of modifications by RSW.
Merge branch 'merge_RSW_mod3_to_master'

Conflicts:
	src/game/Game.java