Merge branch 'master' of https://github.com/Wjzard/ConquestofReffendale

Conflicts:
	mapmaker.js