PR_RAHIM: Conflit
Merge branch 'master' of
ssh://git@github.com/AbderrahmaneGITHUB/GoAndroid.git

Conflicts:
	GoAndroid/src/com/example/goandroid/plateau_neuf.java