added blood particles
Merge remote-tracking branch 'origin/master'

Conflicts:
	site/js/logic/player.js