Merge branch 'master' of https://git.andrewdm.me/www

1 files changed, 74 insertions, 16 deletions

diff --git a/src/changelog.md b/src/changelog.md
index 8b2becd..8cd5ee5 100644
--- a/src/changelog.md
+++ b/src/changelog.md
@@ -1,37 +1,95 @@
 ChangeLog
 =========
 
+## 2017-12-26  AndrewMurrell <ImFromNASA@gmail.com>
+
+Added PDFs, moved tastavi to writing, and added more apocrypha worldbuilding docs
+
+
+## 2017-12-25  AndrewMurrell <ImFromNASA@gmail.com>
+
+converted org to md
+
+
+## 2017-12-24  AndrewMurrell <ImFromNASA@gmail.com>
+
+started the center sea and the empire
+
+    config.yaml                           |   4 +-
+    src/apocrypha/region_thecentersea.org |   8 +++
+    src/apocrypha/region_theempire.org    | 120 +++++++++++++++++++++++++++++++++++++++
+    3 files changed, 130 insertions(+), 2 deletions(-)
+
+## 2017-12-23  AndrewMurrell <ImFromNASA@gmail.com>
+
+link fix
+
+    src/apocrypha/region_thenorth.org | 4 ++--
+    1 file changed, 2 insertions(+), 2 deletions(-)
+
+## 2017-12-23  AndrewMurrell <ImFromNASA@gmail.com>
+
+Region: The North
+
+    src/apocrypha/region_thenorth.org | 85 ++++++++++++++++++++++++++++++++++++++++++++
+    1 file changed, 85 insertions(+)
+
+## 2017-12-23  AndrewMurrell <ImFromNASA@gmail.com>
+
+Fix a 404.
+
+    src/apocrypha/{AnIntroductionToApocrypha.org => anintroductiontoapocrypha.org} | 0
+    .../{TheGournalGeographicAffairs.org => thegournalgeographicaffairs.org}       | 0
+    2 files changed, 0 insertions(+), 0 deletions(-)
+
+## 2017-12-23  AndrewMurrell <ImFromNASA@gmail.com>
+
+updated the categories for the apocrypha items
+
+    src/apocrypha/AnIntroductionToApocrypha.org   | 12 ++++++++++++
+    src/apocrypha/TheGournalGeographicAffairs.org | 12 ++++++++++++
+    2 files changed, 24 insertions(+)
+
+## 2017-12-23  AndrewMurrell <ImFromNASA@gmail.com>
+
+removed some janky psionics
+
+    src/dnd/psionic-schools.org | 220 -------------------
+    src/dnd/psionist.org        | 570 -------------------------------------------------
+    2 files changed, 790 deletions(-)
+
+## 2017-12-23  AndrewMurrell <ImFromNASA@gmail.com>
+
+Added the start of the apocrypha.
+
+    src/apocrypha/AnIntroductionToApocrypha.org   |  17 +++++
+    src/apocrypha/TheGournalGeographicAffairs.org | 125 +++++++++++++++++++++++++++++++
+    src/apocrypha/index.yaml                      |   1 +
+    3 files changed, 143 insertions(+)
+
+## 2017-12-23  AndrewMurrell <ImFromNASA@gmail.com>
+
+Updated the About with an Epigraph
+
+    src/about.md | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
+    1 file changed, 51 insertions(+), 7 deletions(-)
+
 ## 2017-01-24  AndrewMurrell <ImFromNASA@gmail.com>
 
 remove unfinished sources
 
-    src/dnd/psionist-class.md               | 1504 -------------------------------
-    src/dnd/{psionist2.org => psionist.org} |    0
-    src/dnd/spell-gauntlet.org              |  683 --------------
-    3 files changed, 2187 deletions(-)
-
 ## 2017-01-14  Andrew Murrell <merl@neo.andrewdm.me>
 
 updated Psionist Title page
 
-    bin/pre-generate                         | 2 ++
-    src/dnd/{Psionist2.org => psionist2.org} | 4 ++++
-    2 files changed, 6 insertions(+)
-
 ## 2017-01-14  Andrew Murrell <merl@neo.andrewdm.me>
 
 Added an updated Psionist class with more complete domains, but no mind powers yet.
 
-    src/dnd/Psionist2.org | 566 ++++++++++++++++++++++++++++++++++++++++++++++++++
-    1 file changed, 566 insertions(+)
-
-## 2017-01-04  Luke Shumaker <lukeshu@sbcglobal.net>
+## 2017-01-04  Luke Shumaker <lukeshu@lukeshu.com>
 
 Change the title of "Psionist" -> "Psionist Class [5e]"
 
-    src/dnd/Psionist.md | 2 +-
-    1 file changed, 1 insertion(+), 1 deletion(-)
-
 ## 31 August 2016
 
 Decided that the 1/5th of 'Magic is Magic' that was 'finished' was