last commit
Merge branch 'master' of https://github.com/xipx/demo

Conflicts:
	README.md
	three.txt
	zero.txt