launch
Merge branch 'master' of https://github.com/SalvationDevelopment/YGOPro-Support-System

Conflicts:
	server/http/index.html