ProgrammingAssignment2

Updated according to instructions