trying to not mess things up with pull
merged servers
Merge branch 'master' of https://github.com/anidiez/Networks
committing for pull
Merge branch 'master' of https://github.com/anidiez/Networks
made players nonblocking
merged and fixed server and makefile from last pull, handling setup game on server in progress, added comments of what needs to be done... hopefully didn't break client