Merge pull request #1 from bru917/master

First try at pull request
edit read me
test change
calibrate
Merge branch 'master' of https://github.com/cnd11/ECE1160

merege
add setup calibrate
calibrate
Merge pull request #1 from cnd11/master

Trying to pull from camerons master into fork