Assignment 3 from Jianming Zhou
Merge pull request #32 from jz1584/master

Assignment 3 from jz1584