cpyarger Merge branch 'master' of https://github.com/cpyarger/rpi-Thermostat
dad0873 Sep 17, 2013
Merge branch 'master' of https://github.com/cpyarger/rpi-Thermostat
Conflicts:
	README.md
dad0873