asdf
Merge branch 'master' of https://github.com/cstack/death-game

Conflicts:
	UnityProject/Assets/Textures/BasicGroundTile.png.meta
pull request
Merge branch 'master' of https://github.com/cstack/death-game
only get ability once
fixed bird shooting javelin
Merge branch 'master' of https://github.com/cstack/death-game