hehe
Merge branch 'master' of github.com:zhouzhaoping/RhythmPi

Conflicts:
	README.md