change

change
Merge branch 'master' of https://github.com/tokujin/FlyOntheWall2

Conflicts:

FixedFixedEnd_Vibration/bin/FixedFixedEnd_VibrationDebug.app/Contents/Ma
cOS/FixedFixedEnd_VibrationDebug
	FixedFixedEnd_Vibration/src/Vibration.cpp