finished hw2; week3 and fixed folders