first commit
Merge branch 'master' of https://github.com/marvelliu/iotproject

Conflicts:
	robot/camera.py
	robot/checkdaemon.sh
	robot/sensor.py
	robot/tempreader.sh
	robot/test.py
	robot/test/x.py
	robot/xsend.py
	robot/xtalk.py