modified assignment 2
Merge pull request #94 from mtrester/master

Morgan Trester