Updating project to include meta files, which I thought I had changed, but it was disabled anyway
Merge branch 'master' of github.com:Versaiteis/Dungeon-Explorer

Conflicts:
	Dungeon Explorer/Assets/Editor/Plane1x1W1L1VC.asset
	Dungeon Explorer/Assets/Materials/No Name.mat
	Dungeon Explorer/Assets/Prefabs/Quad Test.prefab
	Dungeon Explorer/Assets/Prefabs/Quad.prefab
	Dungeon Explorer/Assets/Scenes/Main.unity
	Dungeon Explorer/ProjectSettings/AudioManager.asset
	Dungeon Explorer/ProjectSettings/DynamicsManager.asset
	Dungeon Explorer/ProjectSettings/EditorBuildSettings.asset
	Dungeon Explorer/ProjectSettings/EditorSettings.asset
	Dungeon Explorer/ProjectSettings/GraphicsSettings.asset
	Dungeon Explorer/ProjectSettings/InputManager.asset
	Dungeon Explorer/ProjectSettings/NavMeshLayers.asset
	Dungeon Explorer/ProjectSettings/NetworkManager.asset
	Dungeon Explorer/ProjectSettings/ProjectSettings.asset
	Dungeon Explorer/ProjectSettings/QualitySettings.asset
	Dungeon Explorer/ProjectSettings/TagManager.asset
	Dungeon Explorer/ProjectSettings/TimeManager.asset