pull merge from lmccart-master

Author: hrishit

lib/p5.js

@@ -2991,10 +2991,13 @@ var inputmouse = function (require, core, constants) {
       if (!this.isMousePressed) {
         if (typeof context.mouseMoved === 'function') {
           context.mouseMoved(e);
+<<<<<<< HEAD
         } else if (typeof context.touchMoved === 'function') {
           e.preventDefault();
           this.setTouchPoints(e);
           context.touchMoved(e);
+=======
+>>>>>>> e2e3627b5b11113d6d7425704b4c4d54fa4c9f76
         }
       } else {
         if (typeof context.mouseDragged === 'function') {