^O this is my commit message
Merge branch 'master' of https://github.com/Elesin/mines-nancy-quadcopter