Random sync
Merge branch 'master' of https://github.com/modestvillain/UniClone

Conflicts:
	Assets/Resources/Prefabs/waterTile.prefab
	Assets/Scripts/General Scripts/DummyAI.cs
	Assets/Scripts/General Scripts/Player.cs
	Assets/Scripts/General Scripts/WorldManager.cs
Merge branch 'master' of https://github.com/modestvillain/UniClone

Conflicts:
	Assets/Resources/Prefabs/waterTile.prefab
	Assets/Scripts/General Scripts/DummyAI.cs
	Assets/Scripts/General Scripts/Player.cs
	Assets/Scripts/General Scripts/WorldManager.cs