SUO?
Binary merge take 2
Revert "Binary merge take 2"

This reverts commit e8e0368283af1963dff23c9a1b001baeed40d491.
Merge branch 'master' of https://github.com/damonrpayne/Shinto

Conflicts:
	HandWaver.Shinto/HandWaver.Shinto.v11.suo

Test