change "our guild" to "the guild"
Merge branch 'feature/the_guild'