rgrge
Merge branch 'master' of github.com:TomHodson/sensors

Conflicts:
	Makefile