edit app.js
Merge branch 'master' of https://github.com/wirder/NoJS-TV

Conflicts:
	webserver/app.js