Commit

Desc
Merge branch 'master' of https://github.com/keisec/YADC

Conflicts:
	Assets/Prefab/MapPrefabs/DangerousLava.prefab
	Assets/Prefab/MapPrefabs/DarkWater.prefab
	Assets/Prefab/MapPrefabs/Hole.prefab
	Assets/Prefab/MapPrefabs/Teleport.prefab
	Assets/Resources.meta
	Assets/Resources/map1.txt.meta
	Assets/Resources/map2.txt.meta
	Assets/Scenes/mainScene.unity
	Assets/Scripts/TeleportScript.cs
	Assets/Scripts/TeleportScript.cs.meta
	Assets/Scripts/mapCreatorScript.cs
	Assets/Textures/Thumbs.db
	ProjectSettings/ProjectSettings.asset
	ProjectSettings/TagManager.asset