x
Merge branch 'master' of https://github.com/mathildegui/bab

Conflicts:
	bin/classes/com/example/bab/CartFragment.class
	bin/classes/com/example/bab/MainActivity.class
	bin/classes/com/example/bab/R$id.class
	bin/classes/com/example/bab/R$layout.class
	bin/classes/com/example/bab/R$menu.class
	bin/classes/com/example/bab/R$string.class
	bin/classes/com/example/bab/R$style.class
	bin/classes/com/example/bab/ResultFragment.class
	bin/classes/com/example/bab/SearchFragment.class
	gen/com/example/bab/R.java
	src/com/example/bab/BarmanCommandActivity.java
ajout confirmation quitter partie barman