fixes
ypo  typo
stuff
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

Conflicts:
	server/actuators/pregulator.c
	server/sensors/strain.c
	testing/MCTXWeb/public_html/control.html
	testing/MCTXWeb/public_html/static/mctx.control.js