2

2
Merge branch 'master' of https://github.com/bqprod/VoiceCOS

Conflicts:
	voice/Form1.cs