i changed parts of the code to be different
Merge branch 'towerdefense2.0' of https://github.com/duke-compsci308-spring2013/vooga into towerdefense2.0

Conflicts:
	src/vooga/towerdefense/controller/Controller.java
	src/vooga/towerdefense/factories/actionfactories/DeathPackageFactory.java
Merge branch 'towerdefense2.0' of https://github.com/duke-compsci308-spring2013/vooga into towerdefense2.0