added stuff
auto merge

Merge branch 'master' of https://github.com/MFoster/servosite
Added a bunch of functioality, first version that brings it all together in some form