change 6
Merge branch 'master' of https://github.com/khtwo/khtwo/

Conflicts:
	conflicttest.txt