Fix invalid JSON crashing the server
Merge branch 'master' of https://github.com/martindale/soundtrack.io
Merge branch 'master' of https://github.com/martindale/soundtrack.io

Conflicts:
	soundtrack.js
Merge branch 'master' of https://github.com/martindale/soundtrack.io
Add validator for cleaning xss from chat
Merge pull request #32 from unusualbob/mark-xss

Markdown xss sanitization