Merge branch 'master' of https://github.com/magictowers/bluefinder.git
properties
update marcia
Merge branch 'master' of https://github.com/magictowers/bluefinder