renamed hw1 & hw2, prepare to make a new branch for hw2