Fixed merge conflicts.
Fixed merge conflicts.

scrollMouse was added, and updated.

octalmage/robotjs,octalmage/robotjs,hristoterezov/robotjs,hristoterezov/robotjs,BHamrick1/robotjs,hristoterezov/robotjs,octalmage/robotjs,BHamrick1/robotjs,hristoterezov/robotjs,octalmage/robotjs,BHamrick1/robotjs,BHamrick1/robotjs