Add websocket transmitting from the remote
Add error checking, fade in
Merge branch 'shannon' of github.com:h0dgep0dge/artemis into jamie
Merge branch 'shannon' of github.com:h0dgep0dge/artemis into jamie
Add swiping between things
I have no idea. Bloody git.
Merge branch 'jamie' into shannon

Conflicts:
	client/index.html
Final merge with shannon