player
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/org/ludumdare28/Inventory.java
	src/main/java/org/ludumdare28/Player.java
add3ed stats