Updated assignment2 with code from assignment1