Can now change ammo
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/example/arcade/coldWarII/SnowUnitButton.java
	src/com/example/arcade/coldWarII/SnowUnitType.java
	src/com/example/arcade/tankwars/Map.java
	src/com/example/arcade/tankwars/TankWarsUserInterface.java
Can now change ammo