carburant,collisions, emerencyllanding
Merge branch 'master' of https://github.com/pangel/ens2012-pj
tests
fix conflcts