Scaling still off
Merge remote-tracking branch 'origin/master'
Scaling stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/example/arcade/coldWarII/ColdWarGame.java