asd2
Merge branch 'master' of github.com:Zecklar/GLFW

Conflicts:
	GLFWsekoilua/main.cpp