quickfix
Merge branch 'master' of https://github.com/Malow/NDYGFX

Conflicts:
	ModelViewer/Source/ModelViewer.cpp