reset head and prepare for fyp demo
Merge branch 'master' of https://github.com/lvyaojia/weibo-raspberrypi-arduino

Conflicts:
	config.py