refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor refactor
Merge branch 'master' of https://github.com/JGerdes/GoldMiner

Conflicts:
	objects/World.h