first commit
Merge branch 'master' of https://github.com/heya101/FRC-3699-2013
second commit