Merge branch 'master' of https://github.com/arjo129/uSpeech

Conflicts:
	vocab.cpp
Merge branch 'master' of https://github.com/arjo129/uSpeech

Conflicts:
	vocab.cpp
Added stat-collector