work
Merge branch 'master' of github.com:Who8MyLunch/Sensor-Monitor

Conflicts:
	who8myrpi/kalman.py