Add
no message
Merge branch 'master' of https://github.com/giapnh/OOT_GoldMiner_Server

Conflicts:
	Server/server.py