Assignment of student 0855993
Merge pull request #6 from reisijoe/master

Assignment of student 0855993