Merge branch 'master' into minor-updates

README.md

@@ -82,37 +82,41 @@ That’s right, we said educate *yourself*. We’re not going to do it for you.
 
 Knowing that there are problems isn’t enough. Pick an organization that helps to improve the tech industry and donate your money or time.
 
-[20/20 Shift](http://www.2020shift.com/)
+- **[20/20 Shift](http://www.2020shift.com/)**
 
-[AlterConf](https://alterconf.com/)
+- **[AlterConf](https://alterconf.com/)**
 
-[Anita Borg Institute](https://anitaborg.org/)
+- **[Anita Borg Institute](https://anitaborg.org/)**
 
-[BIG Accelerator](http://www.digitalundivided.com/accelerate/)
+- **[BIG Accelerator](http://www.digitalundivided.com/accelerate/)**
 
-[Black Girls Code](http://www.blackgirlscode.com/)
+- **[Black Girls Code](http://www.blackgirlscode.com/)**
 
-[CallbackWomen](http://www.callbackwomen.com/)
+- **[CallbackWomen](http://www.callbackwomen.com/)**
 
-[ChickTech](https://chicktech.org/)
+- **[ChickTech](https://chicktech.org/)**
 
-[Codebar](https://codebar.io/)
+- **[Codebar](https://codebar.io/)**
 
-[Fundclub](http://joinfundclub.com/)
+- **[Confa11y](https://www.confa11y.com/)**
 
-[Good for POC in Tech](http://goodforpocin.tech/)
+- **[Fundclub](http://joinfundclub.com/)**
 
-[Hypatia Software Organization](https://hypatiasoftware.org/)
+- **[Girl Develop It](https://www.girldevelopit.com/)**
 
-[I Need Diverse Games](https://ineeddiversegames.org/)
+- **[Good for POC in Tech](http://goodforpocin.tech/)**
 
-[People of Color in Tech](http://peopleofcolorintech.com/)
+- **[Hypatia Software Organization](https://hypatiasoftware.org/)**
 
-[Trans*H4CK](http://www.transhack.org/)
+- **[I Need Diverse Games](https://ineeddiversegames.org/)**
 
-[TransTech](http://transtechsocial.org/)
+- **[People of Color in Tech](http://peopleofcolorintech.com/)**
 
-[She#](https://www.shesharp.co.nz/)
+- **[Trans*H4CK](http://www.transhack.org/)**
+
+- **[TransTech](http://transtechsocial.org/)**
+
+- **[She#](https://www.shesharp.co.nz/)**
 
 Are you a meetup or conference organizer looking to make your event more inclusive? Or do you have some rad tips to help other organizers out? Check out [Let's Do Better](https://github.com/sublimemarch/lets-do-better): a guide to radical inclusion in both physical and digital spaces in the tech industry.
 

contributing.md

@@ -28,13 +28,31 @@ Make changes in a local branch and open a pull request from your fork to the par
 
 This resource currently exists as a series of markdown files. For more information on Github flavored markdown, check out their [handy guide](https://guides.github.com/features/mastering-markdown/).
 
-Please be descriptive in your commit messages :)
+We track discussions and potential additions to the repo via the [issue tracker](https://github.com/stephmarx/so-you-just-learned/issues) on the github repo. We [label issues](#issue-labels) in a way that will help you make your first contribution to the project.
 
-Maintainers of the repo will review the resources linked in your pull request. When your pull request is approved we will squash and merge the commits.
+When you submit your pull request, please be descriptive in your commit messages and PR titles :)
 
-Thank you for your interest in contributing to this project. If you found it useful, please share it far and wide. 
+Maintainers of the repo will [review](#pull-request-submission-and-review-process) the resources linked in your pull request. When your pull request is approved we will squash and merge the commits.
 
-## Core Contributors
+### Issue Labels
+
+- `good for new folks`: We welcome new contributors to help with any issue, and we've tagged some issues as specifically being easily approachable for new contributors. These might include adding links, fixing typos, or other small changes that don't require lots of discussion.
+
+- `discussion requested`: This means that someone would like to have a discussion about an issue proposed to the project. This might include discussing the best way compassionately tackle a current event or how to approach including a new link, for example.
+
+## Pull Request Submission and Review Process
+
+1. When you submit a PR, include any relevant issue numbers either in the title or the PR description.
+
+2. @mention all of the [maintainers](#maintainers) in your PR description to make sure we see it!
+
+3. When 2/3 of the maintainers approve the pull request, we will merge it in.
+
+    a. If we request changes to your PR, we'll usually be pretty specific or invite further discussion. If you're confused about any of the review notes on your pull request, don't be shy about asking for clarification or pushing back. We love healthy discussion. Just be sure to keep our [code of conduct](https://github.com/stephmarx/so-you-just-learned/blob/master/code_of_conduct.md) in mind.
+
+**Thank you for your interest in contributing to this project. If you found it useful, please share it far and wide.**
+
+## Maintainers
 
 - [sublimemarch](https://github.com/sublimemarch)
 - [cmho](https://github.com/cmho)

glossary.md

@@ -53,6 +53,7 @@ Common emotional labor tasks might include teaching skills while managing the st
 ### L
 ### M
 
+
 #### [Marginalized](https://en.wikipedia.org/wiki/Social_exclusion)
 
 *To put or keep (someone) in a powerless or unimportant position within a society or group.*
@@ -61,6 +62,9 @@ Common emotional labor tasks might include teaching skills while managing the st
 
 *A blend of the word man and the informal form splaining of the verb explaining and means "to explain something to someone, characteristically by a man to woman, in a manner regarded as condescending or patronizing"*
 
+#### [Missing Stair](https://en.wikipedia.org/wiki/Missing_stair): *A term used to describe a sexual predator whom many people know cannot be trusted, but who, rather than shunning, they work around by trying to quietly warn others. The term was coined by the blog* [The Pervocracy](http://pervocracy.blogspot.com/2012/06/missing-stair.html) *in 2012.*
+
+
 ### N
 
 #### [Neopronoun](https://nonbinary.miraheze.org/wiki/List_of_neopronouns)
@@ -124,4 +128,3 @@ isk of conforming to stereotypes about their social group.*
 ### X
 ### Y
 ### Z
-