Merge remote-tracking branch 'upstream/master'

Keep the latex and tag-specific feeds in bootstrap3

Conflicts:
	pelican-bootstrap3/templates/base.html

1 files changed, 2 insertions, 0 deletions

diff --git a/SoMA2/templates/author.html b/SoMA2/templates/author.html
new file mode 100644
index 0000000..0b37290
--- /dev/null
+++ b/SoMA2/templates/author.html
@@ -0,0 +1,2 @@
+{% extends "index.html" %}
+{% block title %}{{ SITENAME }} - {{ author }}{% endblock %}