Yang Li Homework 2 

This should be the right merge.