Merge branch 'master' into GoFish

Conflicts:
	.gitignore
	Games/bin/chooseYourOwnAdventure/ChooseYourOwnAdventureRunner.class