Merge branch 'cf'
Merge branch 'cf'
Merge branch 'cf'
Lind affliation fixed
Merge branch 'master' of https://github.com/aeckert2/foxtail_linkage into ae
Merge branch 'ae' into cf