remove redundant player draw(), add comment in on_collide()
Merge branch 'master' of github.com:niksaak/machine

fixing callback, that was ACCIDENTALLY

Via Roxugen
* 'master' of github.com:niksaak/machine:
  Cond enemy added.
  Враги, ресурсы, таймер, игра, заглавие.

Conflicts:
	lua/states/game.lua