.
Merge branch 'master' of github.com:asylum2010/Asylum_Tutorials
Merge branch 'master' of github.com:asylum2010/Asylum_Tutorials

Conflicts:
	ShaderTutors/vc100/13_StencilShadow.vcxproj
	ShaderTutors/vc100/13_StencilShadow.vcxproj.filters
vs 2010 update