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
One Final Comment
Storing my files
Beginning making our game
Fixed odd merge conflict with my good code that had been deleted earlier today
accidentally changed some of our xml files
Beginning making David and Alan's game
Fixed merge
initial commit
Revert "initial commit"

This reverts commit 669b2b76f28c21b95e5315cd5dd59678d4578d77.
initial commit
Initial package hierarchy setup for example game
Added Main and SmashCloneRunAlone classes
Undid changes to characters.xml, defaultvalues.properties, environmentalobjects.xml, and forces.properties.
Fixed merge conflict in the map from upstream. Added back the correct reachedGoal method