made the ls-tree function recursive
add ls-files
conflict is fixed