week2 homework
Merge branch '07.21'