Changes
Merge branch 'origin/master'

Conflicts:
	Kd.txt