Minor alterations + created Connor_primary branch.
Everyone should code within their own branches from now on,
then their changes will be merged into the master branch.
The master branch should always have runnable code!
Merge branch 'Nam_primary' into Connor_primary
Copied DistanceSensor code from years past. Modified it for use this year. Created frc2014.sensors package.
Merged Nam_Primary, fixed 1 conflict in launcher
Merge remote-tracking branch 'origin/Connor_primary' into Pat_Primary