rid
Merge branch 'master' of https://github.com/ftlno/MuteMate
fixed conflict
Conflicts:
	README.md