opengl changes
opengl changes
changet comment to utf-8
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/ma/schiffeversenken/controller/Game.java
Merged changes