master' of https://github.com/JohnMai/WhiteSharks

Conflicts:
	Assets/Scenes/stage1.unity
	Assets/Scripts/npcScript.cs
	Assets/Scripts/playerScript.cs