Merge pull request #23 from FIRST-4030/master

.
.
Merge pull request #26 from FIRST-4030/SamCode

Sam code