mergefiles
Merge branch 'master' of https://github.com/jemah/enchord
updated search functions (distinguish global and local)