Arthur Changes
erge branch 'master' of github.com:benmickey/RobotWar

Conflicts:
	RobotWar.spritebuilder/Source/Configuration.h
	RobotWar.spritebuilder/Source/MainScene.m
	RobotWar.spritebuilder/Source/Resources/Published-iOS/Robot.ccbi
	RobotWar.spritebuilder/SpriteBuilder Resources/Robot.ccb
	RobotWar.spritebuilder/SpriteBuilder Resources/Robot.ccb.ppng