test folder
homework week 4
Merge pull request #2 from mochichan/master

Homework, week x