assignment 6
Merge pull request #14 from pli1988/master

assignment 6 (PHL232)