Merge branch 'GregBe' of https://github.com/Marco-Meyer/TINF13AIBI-Kinect into GregBe

Conflicts:
	2048.py
	grid.py
.
Merge branch 'GregBe' of https://github.com/Marco-Meyer/TINF13AIBI-Kinect into GregBe

Conflicts:
	2048.py
	Engine/sounds.py
	grid.py