Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/com/example/awesomemarblegame/Direction.class
	bin/classes/com/example/awesomemarblegame/MainActivity$1.class
	bin/classes/com/example/awesomemarblegame/MainActivity.class
	bin/classes/com/example/awesomemarblegame/Marble.class
	bin/classes/com/example/awesomemarblegame/SimulationView$1.class
	bin/classes/com/example/awesomemarblegame/SimulationView$2.class
	bin/classes/com/example/awesomemarblegame/SimulationView.class

Merge remote-tracking branch
'origin/master'

Conflicts:
	bin/awesomeMarbleGame.apk
	bin/classes.dex
	bin/classes/com/example/awesomemarblegame/GameBoard.class
	bin/resources.ap_
	src/com/example/awesomemarblegame/GameBoard.java

Merge
remote-tracking
branch
'origin/master'

Conflicts:
	assets/levels/level-5.json
	bin/resources.ap_
	src/com/example/awesomemarblegame/GameBoard.java

Mon
premier
essai pour afficher un level