Merge branch 'master' of https://github.com/WCP52/synthesizer

Conflicts:
	sim/Draft1.asc
Merge branch 'master' of https://github.com/WCP52/synthesizer