Changes to make ButtonTrial useable in an update loop.
Meta
adding a turnkey for configuration of the test
Merge branch 'master' of github.com:leapmotion/p1

Conflicts:
	Assets/Slider.meta
	Assets/Slider/Scripts/SliderDragger.cs.meta.orig.meta
Merge commit 'a89122058ff618634d129c5e42d6de1f5570b7ff'
Clean-up of ButtonMonkey
Adding HasAttempt method to ButtonTrial
Removing lingering debug printout.
Merge commit 'b0ed1577fef0c90cf5a34c72c1ea140d1f40b1f7'
Increase to 4 trials of pushing buttons