Updated Texture2D to use OpenGL functions (essentially its a sprite class now)
Got Keyboard working with glfw!
Updated Texture2D to support different texture files.
Now the base for drawing any 2D sprite (from an image) should be done!
Started to implement texture scaling to the screen for a classis top-left
origin cartesian coordinate system
Merge branch 'master' into 3D

Conflicts:
	src/Graphics/Texture2D.cpp
	src/Graphics/Texture2D.h
Tried to get translation from MINX to OpenGL coords working
Added a test MINX project to the MINX folder
Got the MINX Coords to OpenGL coords tranlations properly working!
2D Almost Complete!
Got MINX to OpenGL coordinate translation working for:
	Position
	Rotation
	Scaling
Fixed GameTime to return non-zero values for elapsed time if the program
is running too quickly
Revert "2D Almost Complete!"

This reverts commit 8f0817594a605ed4930a987363e74b84528e847c.
Merge branch 'master' into 3D
Got spritesheeting working with Texture2Ds
Got Text2D working in MINX. Allows for loading bitmap fonts. Currently
only works with lowercase letters and spaces.
added some 3d stuff
Merge https://github.com/GearChicken/MINX into 3D

Conflicts:
	MINX.sdf
	MINX.v11.suo
	MINX/Debug/MINX.log
	testMINXProject/GemGame/GemGame.sdf
	testMINXProject/GemGame/GemGame.v11.suo
worked more on 3d
Merge branch 'master' of https://github.com/GearChicken/MINX

Conflicts:
	MINX.sdf
	MINX.v11.suo
	MINX/Debug/MINX.log
	testMINXProject/GemGame/GemGame.sdf
	testMINXProject/GemGame/GemGame.v11.suo
linux works
Merge branch 'master' into 3D

Conflicts:
	makefile
	src/Input.ignore/GamePad.cpp
	src/Input.ignore/GamePad.h
	src/Input.ignore/Mouse.cpp
	src/Input.ignore/Mouse.h
still isn't working, just starts up then exits, and sometimes fails to load the file