bu
Merge branch 'master' of https://github.com/pakokrew/project-ComputerVision

Conflicts:
	src/main.cpp
Merge branch 'master' of https://github.com/pakokrew/project-ComputerVision

Conflicts:
	src/main.cpp