Git, please stop breaking.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Client/Client.cs
	Client/Forms/Configuration Form.cs