Merged conflict
Merged

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

Conflicts:
	src/com/gamelabgraz/jam/tpbjg/Player.java