Homework2

Merge homework2 to master