fixed events crashing
formatting
Merge remote-tracking branch 'origin/master'

Conflicts:
	Iwan/hospital/game.py
	Iwan/hospital/items.py