merges c_the_master with c_schoolmaster

It is the same person and I've accidentally added c_schoolmaster. I
merged them in master and I fixed every occurence in all chapters.