Hopefully managed to merge mraof/Minestuck/master.