fix merge with config

README.md

@@ -20,4 +20,3 @@ The configs also have one branch per repo, so when writing Adventures in Fenestr
 
 > git subtree -P config push ../config aif
 
-

glossary.tex

@@ -115,6 +115,8 @@
 
 \newglossaryentry{college}{name={The College of Alchemy},text={the Collage of Alchemy},first={the Collage of Alchemy},description={is where all alchemists go for training.  They maintain a complete monopoly on alchemical magic, and all spells must be learned through them or one of their outposts}}
 
+\newglossaryentry{college}{name={The College of Alchemy},text={the College of Alchemy},first={the College of Alchemy},description={is where all alchemists go for training.  They maintain a complete monopoly on alchemical magic, and all spells must be learned through them or one of their outposts}}
+
 \newglossaryentry{pig}{name={The Mincing Pig},text={the Mincing Pig},first={the Mincing Pig Tavern},description={boasts the reputation as the loudest tavern in town, placed close to the entrance.  Many people don't get farther than `the Pig' when coming to town}}
 
 \newglossaryentry{whitehorse}{name={The White Horse},text={the White Horse},first={the White Horse Inn},description={is a serene and esteemed establishment, with a reputation for high-quality clientel}}