Changed things for no purpose
Merge branch 'master' of https://github.com/dmitrioligy/Tribal-Conquest

Conflicts:
	Render.js