Changes for assignment 2

Complete assignment 2