surface
Merge branch 'master' of https://github.com/LO52-team/LO52-project.git
pouet 2
Merge branch 'master' of https://github.com/LO52-team/LO52-project.git

Conflicts:
	src/com/example/lo52_project/SimpleSurfaceView.java