new change
nnMerge branch 'master' of github.com:nicolastinkl/TK3rdPublicLib

Conflicts:
	README.md