Faulty push, Home2.tscn probably broken?

MiscButtons.gd.orig

@@ -0,0 +1,17 @@
+<<<<<<< HEAD
+extends TouchScreenButton
+
+#func _input(always):
+func _physics_process(delta):
+	if Input.is_action_pressed("move_left") and Input.is_action_pressed("move_right"):
+		show()
+	elif Input.is_action_pressed("ui_end"):
+		hide();
+	
+
+
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+#func _process(delta):
+#	pass
+=======
+>>>>>>> 9841ce41a7dbf89828d925e42afe78aa918fe9de

pictures/gui/interaction/tile_interaction.png.import.orig

@@ -0,0 +1,38 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/tile_interaction.png-ec9b0ff7c845e6e695a2b4932b3edebb.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://pictures/gui/interaction/tile_interaction.png"
+dest_files=[ "res://.import/tile_interaction.png-ec9b0ff7c845e6e695a2b4932b3edebb.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+<<<<<<< HEAD
+flags/filter=false
+=======
+flags/filter=true
+>>>>>>> 9841ce41a7dbf89828d925e42afe78aa918fe9de
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0