conflict fixed
fixed the merge
calibrate controller works
got rid of old images
Merge branch 'master' of https://github.com/gruhls508/FreshSpheroApp into glen