Merge branch 'master' of https://github.com/thsur/voice

Conflicts:
_js/main.js
index.html
ignore
ignore