Working on locations
Merge branch 'master' of https://github.com/terabyte128/frc-scout-2013.git
Capitalized "team" and fixed locations.