gets rid of Unit subclasses
work to refactor strategy package. Need to get back gather action
Gather seems not to be working : /
Merge branch 'master' of https://github.com/Tadimsky/vooga into refactor_sprite_hierarchy_strategy

Conflicts:
	src/vooga/rts/gamedesign/sprite/gamesprites/interactive/Unit.java
	src/vooga/rts/gamedesign/strategy/gatherstrategy/CanGather.java
	src/vooga/rts/gamedesign/strategy/production/CanProduce.java
	src/vooga/rts/state/GameState.java
Add UpgradeNodes. Getsback upgrade feature. Who deleted it : /
Load upgrade node paths into decoder through file. Have upgrade xml take in multiple upgrade trees
make usage of reflection helper static
put Unit and Building back to separate packages
I don't know how to merge this
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
Get soldier to be painted again yay
Merge branch 'master' of https://github.com/Tadimsky/vooga into refactor_sprite_hierarchy_strategy

Conflicts:
	src/vooga/rts/gamedesign/factories/Factory.java
	src/vooga/rts/gamedesign/sprite/gamesprites/interactive/buildings/Tower.java
	src/vooga/rts/gamedesign/sprite/gamesprites/interactive/units/Unit.java
	src/vooga/rts/gamedesign/sprite/gamesprites/interactive/units/Worker.java
	src/vooga/rts/gamedesign/strategy/occupystrategy/CanBeOccupied.java
Bananas
Merged changes and updated old code
fix upgrade in updated factory!!!
Merge branch 'refactor_sprite_hierarchy_strategy' of https://github.com/Tadimsky/vooga into refactor_sprite_hierarchy_strategy
Debugging startGUI compiling
Debugging:/ at least it works:/
Set default information in the Information class