add some comments to try to prvent from merge conflict
Merge branch 'master' of https://github.com/omriBernstein/qgame

Conflicts:
	src/clj/qgame/core.clj