wave fixes
Merge branch 'towerdefense2.0' of https://github.com/duke-compsci308-spring2013/vooga into towerdefense2.0
TROLLS
trying to get hard-coded example working
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/GameElementFactory.java
	src/vooga/towerdefense/factories/TowerDefinition.java
	src/vooga/towerdefense/model/GameMap.java
Merge branch 'towerdefense2.0' of https://github.com/duke-compsci308-spring2013/vooga into towerdefense2.0

Conflicts:
	src/vooga/towerdefense/attributes/DefaultAttributeManager.java
	src/vooga/towerdefense/factories/definitions/GameElementDefinition.java
	src/vooga/towerdefense/factories/definitions/UnitDefinition.java
	src/vooga/towerdefense/factories/examplesfactories/ExampleAuraTowerFactory.java
	src/vooga/towerdefense/gameElements/GameElement.java
	src/vooga/towerdefense/model/GameModel.java
	src/vooga/towerdefense/model/shop/Shop.java
Merge branch 'towerdefense2.0' of https://github.com/duke-compsci308-spring2013/vooga into towerdefense2.0
added rule and level factories