cam mode
Merge branch 'master' of github.com:terakun/ComputerVision

Conflicts:
	Illust/Illust