third commit
Merge branch 'master' of github.com:uloong/demo

Conflicts:
	welcome.txt