merge code commenting changes from week3 branch