Synth patch
Merge conflict
Merge branch 'master' of github.com:mazbox/OwlPatches into mazbox-master

Conflicts:
	includes.h
	patches.cpp