local commit
Merge branch 'master' of https://github.com/oreflow/speechtrix

Conflicts:
	Block.cs