Merge remote-tracking branch 'refs/remotes/origin/master' into monogame

This commit is contained in:
Michael 2017-07-11 15:03:30 -04:00
commit af01804c0f

View file

@ -27,3 +27,7 @@ No, you're wrong. We've actually disabled the Issues tab in place of our own in-
## Contributing
See [`CONTRIBUTING.md`](https://github.com/shiftos-game/ShiftOS/blob/master/CONTRIBUTING.md)
## `Mushroom`
`I'm a mushroom.`