dfdd
Merge branch 'master' of
https://github.com/ClairaLyrae/JavaGameEngine.git

Conflicts:
	GameEngine/src/com/javagameengine/TestGame.java
	GameEngine/src/com/javagameengine/renderer/Renderer.java
Merge branch 'master' of
https://github.com/ClairaLyrae/JavaGameEngine.git

Conflicts:
	GameEngine/src/com/javagameengine/TestGame.java
	GameEngine/src/com/javagameengine/math/Color4f.java
Merge branch 'master' of https://github.com/ClairaLyrae/JavaGameEngine.git
Added transparency and inverse methods to Color4f. Buttons are a thing
now.
Merge branch 'master' of
https://github.com/ClairaLyrae/JavaGameEngine.git

Conflicts:
	GameEngine/src/com/javagameengine/renderer/Renderer.java
Merge branch 'master' of
https://github.com/ClairaLyrae/JavaGameEngine.git

Conflicts:
	GameEngine/src/com/javagameengine/TestGame.java