12345BLILU done
Merge branch 'colorDetect' of https://github.com/bazookan/Android_PST into colorDetect