Merge pull request #68 from liam-middlebrook/master

Added support for travis.yml
Added a list of named colors to Color based on the wikipedia article "Web Colors"
Merge branch 'develop' of https://github.com/GearChicken/MINX into develop
Merge branch 'master' of https://github.com/liam-middlebrook/MINX into feature/colormath

Conflicts:
	include/MINX/Graphics/RenderTarget.h
	src/Graphics/Texture2D.cpp
	src/Input/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
Implemented color arithmetic, fixes #56
Merge remote-tracking branch 'origin/release/1.0.d/feature/colormath' into release/1.0

Conflicts:
	src/Graphics/RenderTarget.cpp