Portland Thursday 3/7/2013
Portland 3/7/2013 Post practice match.
Portland 3/7/2013 RC0 Left Autonomous 6:37pm
Merge branch 'master' of
https://github.com/irs1318dev/irs1318TestBed.git

Conflicts:
	FRC1318TestBed/src/org/usfirst/frc1318/FRC2013/calculators/ShooterCalculator.java