Merge pull request #24 from wilbertom/master

Code of conduct and templating