gaussian/separable
Merge branch 'orange1' of github.com:totruok/orange0 into orange1

Conflicts:
	src/main.cpp