t# This is a combination of 2 commits.

add code of conduct to the doc