Dialogue
Merge branch 'master' of https://github.com/Kaboom242/Penguin_Noir

Conflicts:
	Penguin_noir_game/Library/metadata/12/12e164431dbd8714bbde0aeef453b764
	Penguin_noir_game/Library/metadata/d7/d7083732010791244b3099ecbc4fdc1b
	Penguin_noir_game/Library/metadata/d9/d9a637e69b9f0a7449ee6b6e158ddd5b
	Penguin_noir_game/Penguin_noir_game-csharp.sln
	Penguin_noir_game/Penguin_noir_game.sln