Merge pull request #12 from najezenejjezek/master

merge
drobne rozdeleni casti kodo do samostanych skriptu
Merge remote-tracking branch 'upstream/master'

Conflicts:
	www/script/main.js
fix