Merge remote-tracking branch 'upstream/master'
Merge 'upstream'
fixed wrong variable name
Revert "fixed wrong variable name"

This reverts commit af8523f7ad050715fddc44a1e953f5e0eff62688.
[style] Use four space indentation instead of two on the changes in PR #11
Merge pull request #13 from tagged/style_fixes

[style] Use four space indentation instead of two on the changes in PR #11
Merge pull request #12 from Gordin/master

Removed dead code
Merge branch 'websocket' into upstream

Conflicts:
	src/core.js