Change test socket file to jade
Merge branch 'master' of github.com:joechee/doesntmatter

Conflicts:
	views/testsocket.jade