changes made by cgliu
new file
Merge branch 'master' of https://github.com/cgliu/tmp

Conflicts:
	README.md