second task
Merge branch 'master' of https://github.com/ak239/graphics

Conflicts:
	.gitignore
	Graphics1/Graphics1/GlutApp.cpp
	Graphics1/Graphics1/Graphics1.cpp
	Graphics1/Graphics1/Graphics1.vcxproj
	Graphics1/Graphics1/Graphics1.vcxproj.filters
	Graphics1/Graphics1/RenderObject.cpp
	Graphics1/Graphics1/RenderObject.h
	Graphics1/Graphics1/nvImage.h
	Graphics1/Graphics1/nvImageDDS.cpp
	Graphics1/Graphics1/obj.fs
	Graphics1/Graphics1/obj.vs