Merge branch 'master' of lmno:dither

Conflicts:
	dist/app.css
	dist/app.min.js
	dist/index.html

1 files changed, 6 insertions, 4 deletions

diff --git a/js/help.js b/js/help.js
index 6f39aa7..7bc3a6b 100644
--- a/js/help.js
+++ b/js/help.js
@@ -7,13 +7,15 @@ help.init = function(){
 
 help.bind = function(){
 	$(window).on("scroll DOMMouseScroll mousewheel", function(){ scrolling = true })
-	$("#help").click(function(){ $("#instructions").toggle() ;console.log("zZ") })
-	$("#instructions .close").click(function(){ $("#instructions").toggle() ;console.log("zZ") })
-	$("#instructions").draggable({
+	$("#show-commands").click(function(){ $("#tutorial").hide(); $("#commands").toggle() })
+	$("#show-tutorial").click(function(){ $("#commands").hide(); $("#tutorial").toggle() })
+	$("#commands .close").click(function(){ $("#commands").toggle() })
+	$("#tutorial .close").click(function(){ $("#tutorial").toggle() })
+	$("#commands,#tutorial").draggable({
 		start: drag_start,
 		stop: drag_stop
 	})
-	$("#instructions").disableSelection();
+	$("#commands,#tutorial").disableSelection();
 }
 
 function drag_start(){ dragging = true; $(this).addClass("dragging") }