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

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