Merge pull request #35 from GearChicken/develop

Merging Develop into Release 1.0  From now on anything for release 1.0 will be changed in that branch
Implemented Basic Batching
Updated TextureBatch functions to use batching system
Added new shaders for batching
Updated headers
Merge pull request #57 from GearChicken/release/1.0.d/bugfix/actualBatching

Release/1.0.d/bugfix/actual batching
Merge pull request #66 from liam-middlebrook/master

Added support for travis.yml
Game is now friends with TextureBatch
Fixed issue with TextureBatch being incompatible with RenderTargets that were not the exact size of the GameWindow. ( Fixes #69 )
Updated headers
Merge pull request #72 from GearChicken/release/1.0.d/bugfix/fixedBatchOrtho

Fixed TextureBatch/RenderTarget incompatibility
merged in liam-middlebrook:feature/vec2RandomTweaks and named colors
Updated GameTime fixing #73
removed Game::GetGameTime
Updated headers
Merge pull request #76 from GearChicken/release/1.0.d/bugfix/rewriteGameTime

Release/1.0.d/bugfix/rewrite game time
Merge branch 'master' of https://github.com/liam-middlebrook/MINX into release/1.0

Conflicts:
	src/Graphics/Texture2D.cpp
	src/Graphics/TextureBatch.h
	src/Input/Axis.cpp
Merge branch 'release/1.0' of https://github.com/GearChicken/MINX into release/1.0
Added zlib/libpng license to Axis.cpp
Merge branch 'release/1.0' into release/1.0.d/feature/colormath

Conflicts:
	include/MINX/Graphics/RenderTarget.h
	src/Graphics/Texture2D.cpp
	src/Input/Axis.cpp