Connecting to GitHub
Connecting to GitHub.
Merge branch 'Testing' of https://github.com/WestervilleWildWarbots/master into Testing

Conflicts:
	MasterRobot/src/edu/wpi/first/wpilibj/templates/RobotMap.java