Gets resources working well.
Merge branch 'master' of github.com:WLPhoenix/code-for-conduct