Some changes
Merge branch 'master' into maksenov

Conflicts:
	src/teatrees/game.clj
Merge pull request #14 from clojurecup2014/maksenov

Maksenov
Merge pull request #15 from clojurecup2014/clientside

Clientside
Merge branch 'master' into clientside