Second go Round

Cleaned up and with less code repetion
Merge remote-tracking branch 'origin/master'

Conflicts:
	Synthesizer/Synthesizer/MainClass.cs