Merge branch 'master' into template-archivelink

diff --cc templates/article.html
index 8b16538c99a9b1eb9aebe0f0a9c44194e85ab921,7069ca3b4292e465df25db148d0ea92427909761..771b79549971a1ddb328722a2c45f665531e85e1
--- 1/templates/article.html
--- 2/templates/article.html
+++ b/templates/article.html
@@@ -5,10 -5,11 +5,13 @@@
      <span class="art-date">{{ article.datetime }} by {{ article.author }}</span></p>
      <p class="art-ingress">{{ article.content }}</p>
      {#
-     <p class="art-link"><a href="{{ previous }}">Previous</a></p>
-     <p class="art-link"><a href="{{ previous }}">Next</a></p>
+     <p class="art-links">
+         <a href="{{ next }}">Next</a>&nbsp;
+         <a href="{{ previous }}">Previous</a>&nbsp;
+         <a href="{{ archive }}">Archive</a>&nbsp;
+     </p>
      #}
 +    <a href="{{ url_for("archive.html") }}" class="art-link"><i class="fa fa-rss"></i>
 +                News Archive</a>
  </div>
  {% endblock content %}

diff --cc templates/index.html
index 28b5cdee290d63d0e2262e72dc239cf4edd208e9,7783714f83676b3da9f8238c221ab66944b820d6..4091c5e93e82bb9fb3f3327534f83529c650b60a
--- 1/templates/index.html
--- 2/templates/index.html
+++ b/templates/index.html
@@@ -19,8 -19,13 +19,15 @@@
      <p><b class="art"><a href="{{ article.url }}">{{ article.title }}</a></b>&nbsp;
      <span class="art-date">{{ article.datetime }} by {{ article.author }}</span></p>
      <p class="art-ingress">{{ article.render() }}</p>
+     {#
+     <p class="art-links">
+         <a href="{{ next }}">Next</a>&nbsp;
+         <a href="{{ previous }}">Previous</a>&nbsp;
+         <a href="{{ archive }}">Archive</a>&nbsp;
+     </p>
+     #}
      {% endwith %}
 +    <a href="{{ url_for("archive.html") }}" ckass="art-link"><i class="fa fa-rss"></i>
 +                News Archive</a>
  </div>
  {% endblock content %}