fix merge
Merge branch 'fightingteam' of https://github.com/duke-compsci308-spring2013/vooga

Conflicts:
	bin/vooga/fighter/controller/OneVOneController.class
	bin/vooga/fighter/forces/Force.class
	bin/vooga/fighter/forces/ForceFactory.class
	bin/vooga/fighter/model/loaders/AttackObjectLoader.class
	bin/vooga/fighter/model/loaders/CharacterLoader.class
	bin/vooga/fighter/model/loaders/EnvironmentObjectLoader.class
	bin/vooga/fighter/model/loaders/MapLoader.class
	bin/vooga/fighter/model/loaders/MenuLoader.class
	bin/vooga/fighter/model/loaders/MouseClickLoader.class
	bin/vooga/fighter/model/loaders/MouseLoader.class
	bin/vooga/fighter/model/loaders/ObjectLoader.class
	bin/vooga/fighter/model/objects/AttackObject.class
	bin/vooga/fighter/model/objects/CharacterObject.class
	bin/vooga/fighter/model/objects/EnvironmentObject.class
	bin/vooga/fighter/model/objects/GameObject.class
Merge branch 'fightingteam' of https://github.com/duke-compsci308-spring2013/vooga

Conflicts:
	src/arcade/amazondownloads/temporarythumbnailexample.png
	src/arcade/amazondownloads/temporarythumbnailtest.png
Merge branch 'fightingteam' of https://github.com/duke-compsci308-spring2013/vooga
added the HUDPlayerValueColor class.
Merge branch 'fightingteam' of https://github.com/duke-compsci308-spring2013/vooga
preparing to publish game.
Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga
moved the location of my game manager.
trying to add my game to arcade.
trying to publish game on arcade.
fixing merge conflicts.
Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga
deleted game managers from my game folder.
got JousterGameRunAlone working.
merge