filler
resolved merge
Merge branch 'android' of https://github.com/rayoung/fydp into android
evans changes
Merge branch 'android' of https://github.com/rayoung/fydp into android, added BLE project

Conflicts:
	android/AWGT/src/com/example/awgt/MainActivity.java