Assignment 4
Merge pull request #121 from microcake/master

Assignment 4