notes update
Merge branch 'master' of https://github.com/DrCosinus/GameTest

Conflicts:
	TypeScriptHTMLApp1/nox/notes.txt