My initial commit
added some features
Even better
Merge pull request #8 from andersenyu/master

Our test homework, week 2