commit assignment6
Merge pull request #349 from whimsycwd/master

commit assignment6 by TA