Merge upstream (#111)

2017-08-01 13:07:43 -07:00
parent b61e3daf98 7ef8482568
commit 8150689b48
205 changed files with 1927 additions and 1507 deletions
--- a/README.md
+++ b/README.md
@@ -8,4 +8,3 @@ So here's the deal: we all work on this code, and then it runs on dev.glitch.soc

 - You can view documentation for this project at [glitch-soc.github.io/docs/](https://glitch-soc.github.io/docs/).
 - And contributing guidelines are available [here](CONTRIBUTING.md) and [here](https://glitch-soc.github.io/docs/contributing/).
-