Put on feather javelin sprite
Merge branch 'master' of https://github.com/cstack/death-game

Conflicts:
	UnityProject/Library/assetDatabase3