test 提交gesture
Merge branch 'develop' of https://github.com/xinedison/LeapMotionController.git into develop
version 12.1 4
version 2.0
Merge branch 'develop' of
https://github.com/xinedison/LeapMotionController.git into develop

Conflicts:
	src/edu/pkusz/PCEvent/MusicEvent.java
	src/edu/pkusz/PCEvent/PCControler.java

将原始文件合并，重新推送