Canny start
Merge branch 'orange1' of https://github.com/totruok/orange0 into orange1

Conflicts:
	src/main.cpp