doc
untrack BIN
ok
Merge branch 'master' of https://github.com/pbailhache/Ponk

Conflicts:
	bin/Ponk.apk
	bin/classes.dex
	bin/classes/unilim/projet/ponk/Ball.class
	bin/classes/unilim/projet/ponk/Entity.class
	bin/classes/unilim/projet/ponk/GameActivity.class
	bin/classes/unilim/projet/ponk/GameModel.class
	bin/classes/unilim/projet/ponk/GameView$1.class
	bin/classes/unilim/projet/ponk/GameView$GameThread.class
	bin/classes/unilim/projet/ponk/GameView.class
	bin/classes/unilim/projet/ponk/MainMenu.class
	bin/classes/unilim/projet/ponk/Player.class
	bin/classes/unilim/projet/ponk/R$id.class
	bin/classes/unilim/projet/ponk/R$layout.class
	bin/classes/unilim/projet/ponk/R$menu.class
	bin/classes/unilim/projet/ponk/R$string.class
	bin/classes/unilim/projet/ponk/R$style.class
	bin/classes/unilim/projet/ponk/R$styleable.class
	bin/classes/unilim/projet/ponk/SettingsMenu.class
	bin/resources.ap_