Conflict merging
Merge branch 'master' of
https://github.com/DerManiac/ThePeanutButterJellyGame.git

Conflicts:
	src/com/gamelabgraz/jam/tpbjg/items/ItemType.java