dodaeno od pate
Merge remote-tracking branch 'origin/master'

Conflicts:
	korun/game_korun.js
dodaeni prepreki