implementing picking up of batteries
Merge branch 'master' into items

Conflicts:
	src/item/Item.java