Started working on new NetEvent
Merge branch 'master' of github.com:paranoidgabe/thunder

Conflicts:
	netevent/NetEvent2.py
Removed old WebSocket implementation
Added stuff
Merge branch 'master' of github.com:paranoidgabe/thunder

Conflicts:
	netevent/NetEvent2.py
	netevent/websocket.py
Merge branch 'master' of github.com:paranoidgabe/thunder
Fixed commit issues
derp