Hw2

Merging branch hw2 into master