Merge branch 'teamLocFlip'
Merge branch 'startingPositions' of git://github.com/jzalinger/nbites
Fixes fieldconstants not compiling.
Merge branch 'master' of git://github.com/egoogins/nbites