Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/com/example/awesomemarblegame/GameBoard.class
	bin/classes/com/example/awesomemarblegame/LevelChooser.class
	bin/classes/com/example/awesomemarblegame/MainActivity.class
	src/com/example/awesomemarblegame/GameBoard.java
	src/com/example/awesomemarblegame/LevelChooser.java

GameLayout

Le début de l'implémentation des méthodes/classes du jeu
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/com/example/awesomemarblegame/GameBoard.class
	src/com/example/awesomemarblegame/GameBoard.java