Merge branch 'master' into new-design

This commit is contained in:
Cryptkeeper 2016-02-01 05:41:24 -06:00
commit 6e620e759f

@ -155,7 +155,7 @@
"type": "PC" "type": "PC"
}, },
{ {
"name": "Empire Minecraft", "name": "Empire MC",
"ip": "play.emc.gs", "ip": "play.emc.gs",
"type": "PC" "type": "PC"
} }