initial commit
Merge pull request #27 from mer567/master

Pull request for assignment 3 (mer567)