Basic housekeeping - Lauren :B
Merge branch 'master' of https://github.com/mandalorethx/FRC2013.git