renaming things
Merge branch 'master' of https://github.com/SalvationDevelopment/YGOCoreJS

Conflicts:
	ygoserver.js