OpenGL finished
Merge branch 'master' of https://github.com/matoilic/thesis

Conflicts:
	Documentation/contents/fazit.tex