Working on maps.xml to be cleaner
Merge branch 'fightingteam' of https://github.com/duke-compsci308-spring2013/vooga into fightingteam
Worked more on maps.xml and MapLoader/ObjectLoader
Merge branch 'fightingteam' of https://github.com/duke-compsci308-spring2013/vooga into fightingteam

Conflicts:
	src/vooga/fighter/config/maps.xml