Commit for merge
Merge branch 'master' of https://github.com/vmarquet/yolo

Conflicts:
	main.c