Merge branch 'master' into new-design

This commit is contained in:
Cryptkeeper 2016-02-01 05:38:17 -06:00
commit 728823ac0d

@ -119,11 +119,6 @@
"ip": "mc.arkhamnetwork.org", "ip": "mc.arkhamnetwork.org",
"type": "PC" "type": "PC"
}, },
{
"name": "VikkCraft",
"ip": "hub.vikkcraft.com",
"type": "PC"
},
{ {
"name": "MCMagic", "name": "MCMagic",
"ip": "mcmagic.us", "ip": "mcmagic.us",