Making a good bit of it work.
Merge branch 'master' of github.com:WLPhoenix/code-for-conduct