finished coding assignment2
cleaned up and recommitted