Add blending
Merge branch 'master' of github.com:stephenap07/mustard-hollow

Conflicts:
	Main.cpp