Created Dimension3D
Merge branch 'master' of https://github.com/Tadimsky/vooga into gamedesign
Added my files
work on gatherStrategy
created action package added ProductionAction
added the factory testing file
work on attackStrategy to add weapon feature
fix bug related to cannotAttack. AttackStrategy working
get back check empty weapon method in case of future implementation errors
Merged from gathering
Documenting AttackStrategy
got resource gathering working
Merge branch 'gamedesign-gathering' of https://github.com/Tadimsky/vooga into gamedesign-gathering

Conflicts:
	src/vooga/rts/controller/GameController.java
	src/vooga/rts/gamedesign/sprite/rtsprite/Resource.java
	src/vooga/rts/gamedesign/sprite/rtsprite/interactive/IGatherable.java
	src/vooga/rts/gamedesign/strategy/gatherstrategy/CanGather.java
Merge pull request #4 from Tadimsky/gamedesign-gathering

Gamedesign gathering
playing around with images and workers
Load XML to create UpgradeTree works
Merge branch 'gamedesign' of https://github.com/Tadimsky/vooga into gamedesign
Merge branch 'gamedesign' of https://github.com/Tadimsky/vooga into gamestate
HealthUpgrade works!
Damage upgrade works! TODO: deal with cases when Weapon doesn't exist