readd demo
t :wq
Merge branch 'master' of github.com:fujohnwang/qqrsys.com

Conflicts:
	public/demo
merge by rename