asdfasdf
dfdf
modify conflict
Merge branch 'master' of https://github.com/FlaShilver/yourvoicealarm
asdf
sdfsdfsdf
delete pyc
Merge branch 'master' of https://github.com/FlaShilver/yourvoicealarm