Commiting my most recent upated before mark's merge
Merge branch 'master' of https://github.com/tfhartmann/mc-overviewer-configs

Conflicts:
	Bungalow.cfg