Minor update
Merge branch 'master' of https://github.com/jannickj/multipacman

Conflicts:
	FlamingGoose/GooseEngine/GooseEngine/bin/Debug/GooseEngine.dll
	FlamingGoose/GooseEngine/GooseEngineController/bin/Debug/GooseEngine.dll
	FlamingGoose/GooseEngine/GooseEngineController/bin/Debug/GooseEngineController.dll
	FlamingGoose/GooseEngine/GooseEngine_Test/bin/Debug/GooseEngine.dll
	FlamingGoose/GooseEngine/GooseEngine_Test/bin/Debug/GooseEngine_Test.dll
	FlamingGoose/GooseEngine/iilang/iilang/bin/Debug/iilang.exe
	FlamingGoose/GooseEngine/iilang/iilangTest/bin/Debug/iilang.exe
	FlamingGoose/GooseEngine/iilang/iilangTest/bin/Debug/iilangTest.dll