lab stuff
Merge pull request #1 from thinkaliker/ls

stuff we did for lab 5