Toast
Merge branch 'master' of https://github.com/Kowah/GameLibrary

Conflicts:
	JSFML-GameLibrary/src/bzh/kovvah/gl/graphics/GLWindow.java