modified version to get control key
Merge pull request #61 from jtanx/master

modified version to get control key
Added new GUI with refreshing interface.
Merge pull request #62 from firefields/master

Added new GUI with refreshing interface.
Automatic commit of irc logs
Fix everything

Jeremy helped*

* He did most of it.
Automatic commit of irc logs
mf
Add samplerate control to control page
Ignore static libs
Add legend + save image works better
Experiment with unblurring the captured image
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
Add in live values data page + minor gui fixes
Fix button disable bug
Modified data page and added some report stuff
Automatic commit of irc logs