using new map object
using new map object
Merge branch 'master' of https://github.com/Osyrus/xenoharvest

Conflicts:
	main.py
	server.py