test 3
Merge branch 'master' of github.com:jvignolles/yolo-project

Conflicts:
	foo.txt