Hopefully this will fix any git-related issues. Danny made a .gitignore file that should prevent any further problems.
This is the 2013 robot code only -- there is a separate repo for the 2012 robot.