Debug window class (commit #2)
Merge remote-tracking branch 'origin/master'

Conflicts:
	Pukli/Pukli.vcxproj.filters