desktop setup
Merge branch 'master' of https://github.com/allthetime/RTCInsanity

Conflicts:
	client/index.html
	client/stylesheets/style.css