fhskdjfhs
Merge branch 'CalculateHomography' of https://github.com/Arryn99/AugRealityOpenGL3OpenCV into CalculateHomography

Conflicts:
	AugmentedReality/OpenGLFramework/light.ps
	AugmentedReality/OpenGLFramework/light.vs