added code of conduct
Merge branch 'master' into create-parallel