Change the color of player 2
Merge branch 'master' of github.com:matessim/GGJ2014

Conflicts:
	src/client/client.py
	src/server/server.py