finished code for -l and -a
Merge branch 'ls'