Axaxaxa
Merge branch 'master' of https://github.com/Meduzjam/mas

Conflicts:
	client.cpp