initialize web-demo
Merge branch 'master' of https://github.com/gao-lei/web-demo

Conflicts:
	.gitignore