glsubbuffer2

sup'''
Merge branch 'master' of https://github.com/BBlayne/COMP371-Codebase

Conflicts:
	Codebase-Comp371/Codebase-Comp371.sdf
	Codebase-Comp371/Codebase-Comp371.suo
	Codebase-Comp371/Codebase-Comp371/Debug/Codebase-Comp371.vcxprojResolveAssemblyReference.cache
	Codebase-Comp371/ipch/codebase-comp371-3b26fb01/codebase-comp371-11f1ac59.ipch