Merged in my local file for assignment 3
Merge pull request #10 from im965/master

Pull