diff --git a/gitignore_back b/gitignore_back
new file mode 100644
index 00000000..a47c8d12
--- /dev/null
+++ b/gitignore_back
@@ -0,0 +1,17 @@
+.DS_Store
+app/_cache/pages/*
+!app/_cache/pages/.gitignore
+app/_cache/templates/*
+!app/_cache/templates/.gitignore
+<<<<<<< HEAD
+logs
+.htaccess
+*.esproj
+*.espressostorage
+gh-stacey.esproj*
+=======
+app/_cache/images/*
+!app/_cache/images/.gitignore
+
+logs
+>>>>>>> upstream/master
diff --git a/templates/base/base.twig b/templates/base/base.twig
new file mode 100644
index 00000000..260248fb
--- /dev/null
+++ b/templates/base/base.twig
@@ -0,0 +1,22 @@
+
+
+{% block head %}
+
+
+ {% block title %}{{ page.name }}'s Portfolio{% endblock title %}
+
+
+
+{% endblock head %}
+
+{% block content %}
+
+
+ {% block footer %}
+
+ {% endblock footer %}
+
+{% endblock content %}
+
diff --git a/templates/default.html b/templates/default.html
index 81fb6462..d495d682 100644
--- a/templates/default.html
+++ b/templates/default.html
@@ -1,12 +1,12 @@
-
-
-
-
- {{ page.name }}'s Portfolio
-
-
-
+{% extends "base/base.twig" %}
+
+ {% block title %}{{ page.title }}, {{ parent() }} {% endblock title %}
+
+ {% block head %}
+ {{ parent() }}
+ {% endblock head %}
+
+ {% block content %}
@@ -20,8 +20,9 @@
{% include 'partials/navigation/category-lists.html' %}
-
+ {% block footer %}
+ {{ parent() }}
+ {% endblock footer %}
-
-
+
+ {% endblock content %}
diff --git a/templates/page.html b/templates/page.html
index 9536bd21..6fabbe60 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -1,12 +1,8 @@
-
-
-