Initial commit
Merge branch 'master' of github.com:junlin00/demo

Conflicts:
	README.md