World generation and entityspawnign made better
Merge branch 'master' of https://github.com/svuolli/coldworld

Conflicts:
	locals.py