slight changes
Merge remote-tracking branch 'upstream/master'
Change from usleep and gettimeofday to clock_nanosleep and clock_gettime

Requires -std=gnu99 instead of -std=c99
Increase precision of timestamps

Since we have nanosecond resolution. Theoretically.
Merge pull request #59 from jtanx/master

Control updates and stuff
Add define for compiling under RTLinux

Tested on amd64; doesn't really improve sampling consistency over vanilla.
But whatever.
Merge branch 'master' of github:szmoore/MCTX3420

Conflicts:
	server/control.c
Fix sensor header

Added averaging to sensors but forgot to commit sensor.h
Got overwritten in previous merge.
Automatic commit of irc logs
Merge remote-tracking branch 'upstream/master'
added canny edge
Merge pull request #60 from Callum-/master

updated dilatometer