Little Change
Merge branch 'master' of https://github.com/Snaquaza/Showdown-Boilerplate-1

Conflicts:
	sockets.js