bidule
Merge branch 'master' of https://github.com/MarcelToupie/yolo-batman

Conflicts:
	res/Documents/test
	src/application.cpp