Reset upgrade points to 0
Merge branch 'master' into BossAlien

Conflicts:
	SpaceInvadersEPIC.jar
	SpaceInvadersEPIC/bin/spaceInvaders/UpgradeShop.class