merge
Merge branch 'master' of https://github.com/Earthstar/birdmap
bird filtering works
merge