healthPotion
collect items

Conflicts:
	GameDemo/src/com/angrynerds/gameobjects/Player.java