First test version

Merge branch 'master' of https://github.com/mdanemberg/talksbuzz

Conflicts:
	app.js
	package.json