Merge branch 'master' of https://github.com/Tadimsky/vooga into refactor_sprite_hierarchy_strategy

Conflicts:
	src/vooga/rts/gamedesign/factories/DecodeMatchUp
	src/vooga/rts/gamedesign/factories/Factory.java
	src/vooga/rts/gamedesign/factories/UpgradeDecoder.java
	src/vooga/rts/gamedesign/factories/UpgradeNodeMatchUp
	src/vooga/rts/gamedesign/sprite/gamesprites/interactive/InteractiveEntity.java
	src/vooga/rts/gamedesign/sprite/gamesprites/interactive/units/Soldier.java
	src/vooga/rts/gamedesign/sprite/gamesprites/interactive/units/Unit.java
	src/vooga/rts/gamedesign/upgrades/DamageUpgradeNode.java
	src/vooga/rts/gamedesign/upgrades/RangeUpgradeNode.java
	src/vooga/rts/gamedesign/upgrades/UpgradeNode.java
	src/vooga/rts/state/GameState.java
	src/vooga/rts/tests/TestUpgrade.java
Merge branch 'refactor_sprite_hierarchy_strategy' of https://github.com/Tadimsky/vooga into refactor_sprite_hierarchy_strategy

Conflicts:
	src/vooga/rts/gamedesign/factories/DecodeMatchUp
	src/vooga/rts/gamedesign/factories/Factory.java
	src/vooga/rts/gamedesign/factories/UpgradeDecoder.java
	src/vooga/rts/gamedesign/factories/UpgradeNodeMatchUp
	src/vooga/rts/gamedesign/sprite/gamesprites/interactive/InteractiveEntity.java
	src/vooga/rts/gamedesign/sprite/gamesprites/interactive/units/Soldier.java
	src/vooga/rts/gamedesign/sprite/gamesprites/interactive/units/Unit.java
	src/vooga/rts/gamedesign/upgrades/DamageUpgradeNode.java
	src/vooga/rts/state/GameState.java
	src/vooga/rts/tests/TestUpgrade.java