add limit to log function
made the ls-tree function recursive
add ls-files
commit from jesle
conflict is fixed
changed log output to 30 from 25
small tweak
main merging