added some comments to testing
Merge remote-tracking branch 'upstream/master'
still working on testing the long clicks
Merge remote-tracking branch 'upstream/master'
stuff
Merge pull request #212 from rjynn/newBranch

merged my changes with erics