finish coding assignment 2
hw2
Merge branch 'master' into fetch_head