Update.
Merge branch 'master' of https://github.com/erosnick/DX11Study

Conflicts:
	DX11Study/DX11Study.v12.suo