Merge branch 'master' of https://github.com/kellyduang/voicelet

Conflicts:
	cards.js
	index.html
xxx