fix no data received crashing app
Merge branch 'master' of heroku.com:mtlv2 into heroku

Conflicts:
	server.js
Merge branch 'master' of https://github.com/loadedsith/mlt into heroku

Conflicts:
	server.js
Merge branch 'master' of heroku.com:mtlv2