gs
Merge branch 'master' of https://github.com/T1m0nat0r/StupidRobot

Conflicts:
	StupidRobot.Gamemaster/Gamemaster.cs
Merge branch 'master' of https://github.com/T1m0nat0r/StupidRobot