commit 4bba6b3110fce5068cb05e7bd368dca5d2f1b7af
Author: Malin Freeborn <malinfreeborn@tutamail.com>
Date:   Sun Nov 24 19:35:56 2019 +0100

    fix glossary problem

commit 688ea0c0451ce1b89f3df23f0d8edba9c52097d5
Merge: 2a8ab0c 6295c054
Author: Malin Freeborn <malinfreeborn@tutamail.com>
Date:   Sun Nov 24 19:34:25 2019 +0100

    Merge commit '6295c054' into off

commit 6295c054
Author: Malin Freeborn <malinfreeborn@tutamail.com>
Date:   Sun Nov 24 19:26:05 2019 +0100

    arrange glossary line by line

commit 58f5ac78
Merge: 5fc9e6b2 eca2bc0e
Author: Malin Freeborn <malinfreeborn@tutamail.com>
Date:   Sun Nov 24 08:23:14 2019 +0100

    Merge branch 'aie'

commit eca2bc0e
Author: Malin Freeborn <malinfreeborn@tutamail.com>
Date:   Sun Nov 24 12:43:43 2019 +0700

    add deans to glossary

commit 5fc9e6b2
Author: Malin Freeborn <malinfreeborn@tutamail.com>
Date:   Sat Nov 23 13:59:32 2019 +0100

    fucked merge, sorting now

commit 7e4bdf87
Author: Malin Freeborn <malinfreeborn@tutamail.com>
Date:   Sat Nov 23 13:55:29 2019 +0100

    fix merge with config

commit 4bc8e5eb
Merge: 3bac2ad3 0c82bf42
Author: Malin Freeborn <malinfreeborn@tutamail.com>
Date:   Sat Nov 23 10:20:44 2019 +0100

    Merge commit '0c82bf42' into off

commit 3bac2ad3
Author: Malin Freeborn <malinfreeborn@tutamail.com>
Date:   Sat Nov 23 10:20:35 2019 +0100

    merging