Merge branch 'master' of github.com:TinaJ/snakes

Conflicts:
	game.py
dodana tinina kaca
kača gre levo
merge
Merge branch 'Eva17-master'