vampires fixed
modified collision
working on collision for tiles
splatter-effects
Merge remote-tracking branch 'origin/master'
splatter-effects
splatter-effects
splatter-effects
splatter-effects
Merge remote-tracking branch 'origin/master'

Conflicts:
	TNF2D/public_html/hero.js