Prvni pokusy se siti
Merge branch 'master' of github.com:mjirik/pycanoid

Conflicts:
	citygate.py
	testGame.py