Assignment branch.
Merge pull request #85 from jackyyf/assignment

jackyyf's homework