recover health from picked up items
Merge branch 'health-potions' into master2

Conflicts:
	Java Version/Game.java