Changes to bits an bobs
Merge remote-tracking branch 'origin/master'

Conflicts:
	Iwan/hospital/game.py
	Iwan/hospital/items.py
Merge branch 'master' of https://github.com/iwanfrancis/Group-13