Added all of assignment 2. Challenge not included yet.