Merge pull request #1 from douglascraigschmidt/master

Assignment 6 - line ulpdates to my folk repo