blah
awesome fx on channel change
made the channel switch effect cooler
click to make fullscreen.
random channel on shake
fixed bug which crashed server when
better build. server.js seperated into multiple sections,
npm shrinkwrap
Merge branch 'master' into bastien

Conflicts:
	JSON/channels.json
changed jsonCleaner directory