assignment2 complete

Completed everything except extra credit.