trash

f
Merge branch 'master' of https://github.com/theVDude/tagpro-scorebot

Conflicts:
	sockettest.js
	userscript.js