uprava strely
kolize hracskych strel a nepratel
Merge branch 'master' of https://github.com/najezenejjezek/SP_html5_game

Conflicts:
	www/script/main.js
	www/script/shoot.js
funkce shoot
Merge remote-tracking branch 'upstream/master'

Conflicts:
	www/script/shoot.js
upraveno po merge
Merge pull request #5 from najezenejjezek/master

another merge