name change
Merge branch 'master' of https://github.com/JackpineStudio/voice-html-edit

Conflicts:
	index.html