Modify demo2.txt test
Merge branch 'master' of https://github.com/erhwenkuo/test

Conflicts:
	demo2.txt