fix after  merging unit-test_Xbee, the resolution for conflict in ./flymaple/MakeFile did not work previously
Merge pull request #5 from tttor/tmp

fix after  merging unit-test_Xbee, the resolution for conflict in ./flymaple/MakeFile did not work previously