I hope I don't fuck it up
Merge branch 'master' of https://github.com/Matheus28/SourceMod.js

Conflicts:
	msvc10/sdk.suo

what goes here