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

Conflicts:
	TPBJGConfig.properties
Merge branch 'master' of https://github.com/DerManiac/ThePeanutButterJellyGame.git