добавлены мера
Merge branch 'master' of https://github.com/moggot/cryptoVoice
мера

Conflicts:
	functions.h