1111
Merge branch 'master' of https://github.com/lufb/code

Conflicts:
	test3.txt