Zbraně
Merge branch 'master' of github.com:Qaterknan/LudumDare29
Merge branch 'master' of github.com:Qaterknan/LudumDare29

Conflicts:
	js/player.js