minor modif
Merge branch 'master' of https://github.com/Mathgoat/square-loot.git
power room light position correction
Merge branch 'master' into items

Conflicts:
	src/item/Item.java