Hw2

Merge hw2 branch into main branch