diff --git a/MoCha/Assets/Prefabs/Navigation.prefab b/MoCha/Assets/Prefabs/Navigation.prefab
index c91a422..0b1ed35 100644
Binary files a/MoCha/Assets/Prefabs/Navigation.prefab and b/MoCha/Assets/Prefabs/Navigation.prefab differ
diff --git a/MoCha/Assets/Prefabs/Title.prefab b/MoCha/Assets/Prefabs/Title.prefab
index 2ebe5cf..bfb4fe2 100644
Binary files a/MoCha/Assets/Prefabs/Title.prefab and b/MoCha/Assets/Prefabs/Title.prefab differ
diff --git a/MoCha/Assets/Scenes/Credits.unity b/MoCha/Assets/Scenes/Credits.unity
index 63aaee6..4435b89 100644
Binary files a/MoCha/Assets/Scenes/Credits.unity and b/MoCha/Assets/Scenes/Credits.unity differ
diff --git a/MoCha/Assets/Scenes/Goals.unity b/MoCha/Assets/Scenes/Goals.unity
index fc2195b..94e94ab 100644
Binary files a/MoCha/Assets/Scenes/Goals.unity and b/MoCha/Assets/Scenes/Goals.unity differ
diff --git a/MoCha/Assets/Scenes/Home.unity b/MoCha/Assets/Scenes/Home.unity
index 2be0cac..a1c1f66 100644
Binary files a/MoCha/Assets/Scenes/Home.unity and b/MoCha/Assets/Scenes/Home.unity differ
diff --git a/MoCha/Assets/Scenes/Leaderboard.unity b/MoCha/Assets/Scenes/Leaderboard.unity
index 92ba7cf..5e0ea95 100644
Binary files a/MoCha/Assets/Scenes/Leaderboard.unity and b/MoCha/Assets/Scenes/Leaderboard.unity differ
diff --git a/MoCha/Assets/Scenes/Main.unity b/MoCha/Assets/Scenes/Main.unity
index 770bca1..21a0af1 100644
Binary files a/MoCha/Assets/Scenes/Main.unity and b/MoCha/Assets/Scenes/Main.unity differ
diff --git a/MoCha/Assets/Scenes/MonsterCreator.unity b/MoCha/Assets/Scenes/MonsterCreator.unity
index 257deac..80e87a3 100644
Binary files a/MoCha/Assets/Scenes/MonsterCreator.unity and b/MoCha/Assets/Scenes/MonsterCreator.unity differ
diff --git a/MoCha/Assets/Scenes/Stats.unity b/MoCha/Assets/Scenes/Stats.unity
index 79e79e8..c69849f 100644
Binary files a/MoCha/Assets/Scenes/Stats.unity and b/MoCha/Assets/Scenes/Stats.unity differ
diff --git a/MoCha/ProjectSettings/EditorBuildSettings.asset b/MoCha/ProjectSettings/EditorBuildSettings.asset
index 2fef5ca..e37f067 100644
Binary files a/MoCha/ProjectSettings/EditorBuildSettings.asset and b/MoCha/ProjectSettings/EditorBuildSettings.asset differ
diff --git a/MoCha/ProjectSettings/ProjectSettings.asset b/MoCha/ProjectSettings/ProjectSettings.asset
index 34db7e5..94d609a 100644
Binary files a/MoCha/ProjectSettings/ProjectSettings.asset and b/MoCha/ProjectSettings/ProjectSettings.asset differ
diff --git a/MoCha/ProjectSettings/ProjectVersion.txt b/MoCha/ProjectSettings/ProjectVersion.txt
index ddc29c5..ac7d214 100644
--- a/MoCha/ProjectSettings/ProjectVersion.txt
+++ b/MoCha/ProjectSettings/ProjectVersion.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
 m_EditorVersion: 2017.4.0f1
-=======
-m_EditorVersion: 2017.3.1f1
->>>>>>> alex