wuzgood
player now can die and respawn
Merge branch 'master' into healthbar

Conflicts:
	slab/Assets/Scripts/Boat.cs