diff --git a/.gitignore b/.gitignore
index a991081..3bebef5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,38 @@
+<<<<<<< HEAD
+[Ll]ibrary/
+[Tt]emp/
+[Oo]bj/
+[Bb]uild/
+[Bb]uilds/
+Assets/AssetStoreTools*
+
+# Visual Studio 2015 cache directory
+.vs/
+
+# Autogenerated VS/MD/Consulo solution and project files
+ExportedObj/
+.consulo/
+*.csproj
+*.unityproj
+*.sln
+*.suo
+*.tmp
+*.user
+*.userprefs
+*.pidb
+*.booproj
+*.svd
+*.pdb
+
+# Unity3D generated meta files
+*.pidb.meta
+
+# Unity3D Generated File On Crash Reports
+sysinfo.txt
+
+# Builds
+*.apk
+=======
 [Ll]ibrary/
 [Tt]emp/
 [Oo]bj/
@@ -32,3 +67,4 @@ sysinfo.txt
 # Builds
 *.apk
 *.unitypackage
+>>>>>>> 5ca18b79385c3c0ce0737c39e91bd623130106ed
diff --git a/Labyrinth/BreakThrough.unitypackage b/Labyrinth/BreakThrough.unitypackage
new file mode 100644
index 0000000..cd29ca4
Binary files /dev/null and b/Labyrinth/BreakThrough.unitypackage differ