better collition detection and all items are picked up
merge
.
Merge branch 'master' of
https://github.com/DerManiac/ThePeanutButterJellyGame.git

Conflicts:
	TPBJGConfig.properties
	src/com/gamelabgraz/jam/tpbjg/Player.java
	src/com/gamelabgraz/jam/tpbjg/ThePeanutButterJellyGame.java