j'ai trollé LOOOL
Merge branch 'master' of https://github.com/jcleneveu/canard

Conflicts:
	main.c