THE STUFF.
Grid working and stuff.
Merge branch 'master' of github.com:fristedt/inda12-project

Conflicts:
	jogl/Main.java
	jogl/MyGLEventListener.java
	jogl/MyKeyListener.java