Merge branch 'master' into new-design

This commit is contained in:
Cryptkeeper 2016-02-01 05:40:22 -06:00
commit ff503f6036

@ -153,5 +153,10 @@
"name": "BeanBlockz",
"ip": "mc.beanblockz.com",
"type": "PC"
}
]
},
{
"name": "Empire Minecraft",
"ip": "play.emc.gs",
"type": "PC"
}
]