testing kdiff
Merge branch 'master' of https://github.com/KaBKa/WriteTowers

Conflicts:
	nope.txt