[tony & Dan] inceput fix test
Merge branch 'master' of github.com:cegekanocturne/godgame
Merge remote-tracking branch 'origin/master'