v 0.4.2 - unfinished
Merge remote-tracking branch 'origin/master'

Conflicts:
	GUI.py
	Main.py
	MapObject.py
	Monster.py