Added upgrade, and bomb ability when X is pressed.
Added String 'tags' to upgrades
Prevents merging issues
Merge branch 'master' into UpgradesSystem

Conflicts:
	SpaceInvadersEPIC/bin/spaceInvaders/Game$KeyInputHandler.class
	SpaceInvadersEPIC/bin/spaceInvaders/Game.class
	SpaceInvadersEPIC/bin/spaceInvaders/UpgradeShop$1.class
	SpaceInvadersEPIC/bin/spaceInvaders/UpgradeShop.class
	SpaceInvadersEPIC/src/spaceInvaders/Game.java
	SpaceInvadersEPIC/src/spaceInvaders/UpgradeShop.java
	SpaceInvadersEPIC/src/sprites/Thumbs.db
added bomb explosion! AWESOME!
Merge branch 'UpgradesSystem' of https://github.com/Daniel300/SpaceInvadersEpic into UpgradesSystem
changed bomb stuff.
Merge branch 'master' into Title-screen