sdf
Merge branch 'master' of https://github.com/tylercd100/raspberry

Conflicts:
	arduino.pyc
	condition.pyc
	device.pyc
	model.pyc
	schedule.pyc
	sensor.pyc
	sensor_record.pyc