Assignment 2
Merge pull request #14 from fumif/master

Assignment 2