Merge branch 'master' of github.com:dubotics/urc2014 [into Collin's working copy]