new rebase
new rebase 2
Merge branch 'master' of github.com:scottmccain/tempmonitor

Conflicts:
	configure.sh
	lib/makefile
	lib/spi-dev.h
	main.cpp
	makefile