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