update
Merge branch 'master' of https://github.com/qsz13/Bounce

Conflicts:
	SettingLayer.h
update