Hw2

Merge to master