getting server to run
Merge branch 'master' of https://github.com/codyfrenzel/GetMyMusic

Conflicts:
	client
	client.cpp