grrrrr git
Merge branch 'master' of https://github.com/B4NX/Message-Me

Conflicts:
	Client/Program.cs
	UDP.v12.suo