Suryeon changes
Merge branch 'master' of https://github.com/SuryeonK/buzzcat

Conflicts:
	www/js/index.js
Handlebars added