hw6 steps 1 to 3

merge staging to master