Merge branch 'master' of https://github.com/steeno/bombit

Conflicts:
	bombit/Cube.cs
	bombit/OGLWindow.cs
	bombit/Quad.cs
Merge branch 'master' of https://github.com/steeno/bombit