menu perdu et gagné
Merge branch 'master' of https://github.com/Loulou54/Colibri

Conflicts:
	gen/com/game/colibri/R.java
	res/values/strings.xml
	src/com/game/colibri/Jeu.java