Merge branch 'master' into alex

.gitignore

@@ -33,3 +33,4 @@
 **/UnityPackageManager/
 MoCha/Assets/Plugins/Android.meta
 MoCha/ProjectSettings/ProjectVersion.txt
+MoCha/Assets/Plugins.meta

MoCha/Assets/Plugins.meta

@@ -1,16 +0,0 @@
-fileFormatVersion: 2
-<<<<<<< HEAD
-guid: c0d1cd17861ddfa469b8a67ce9249897
-folderAsset: yes
-timeCreated: 1523557753
-=======
-guid: eba9d66c763b541cfbbd65c831b9bdd0
-folderAsset: yes
-timeCreated: 1523992298
->>>>>>> darrel
-licenseType: Free
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

MoCha/Assets/Scenes/Goals.unity.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 4b0ca444941a84684a96bbf0c34cadf5
+timeCreated: 1524164968
+licenseType: Free
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MoCha/Assets/Scripts/Goals.cs

@@ -0,0 +1,16 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Goals : MonoBehaviour {
+
+	// Use this for initialization
+	void Start () {
+		
+	}
+	
+	// Update is called once per frame
+	void Update () {
+		
+	}
+}

MoCha/Assets/Scripts/Goals.cs.meta

@@ -0,0 +1,13 @@
+fileFormatVersion: 2
+guid: 5f138b644c262457385474b2256308a7
+timeCreated: 1524165858
+licenseType: Free
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MoCha/Assets/Scripts/SceneLoader.cs

@@ -15,6 +15,7 @@ public class SceneLoader : MonoBehaviour {
 	public void LoadScene()
 	{ 
 		string scenetext = buttontext.text;
+		Debug.Log (" " + scenetext);
 
 		switch (scenetext) {
 		case "Home":