...
Fixing merge conflict in test/scripts/Makefile
organisms2lca: First version done. No name cache implemented yet.