Merge remote-tracking branch 'origin/master'

Conflicts:
	MazeGen/MazeGen/MazeGenerator.cs
	MazeGen/WindowsFormsApplication1/Form1.cs