MAJ TNI
Merge branch 'master' of github.com:Nancyborg/Nancyborg
test commit
ça me gonfle
Merge branch 'master' into optimisation-navigation

Conflicts:
	informatique/ia-raspberry/src/ia/nancyborg2014/Ia.java