Merge branch 'logo-license' into development.

3 files changed, 11 insertions, 1 deletions

diff --git a/README.md b/README.md
index 3d2ffe8..4010961 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,11 @@ on [PyPI](http://pypi.python.org/pypi/pystache). This version of
 Pystache passes all tests in [version
 1.1.2](https://github.com/mustache/spec/tree/v1.1.2) of the spec.
 
-Logo: [David Phillips](http://davidphillips.us/)
+![](http://i.creativecommons.org/l/by-sa/3.0/88x31.png "Creative
+Commons Attribution-ShareAlike 3.0 Unported License")
+Logo by [David Phillips](http://davidphillips.us/) licensed under a
+[Creative Commons license](http://creativecommons.org/licenses/by-sa/3.0/deed.en_US).
+
 
 Requirements
 ------------
diff --git a/TODO.md b/TODO.md
index 5f19fa3..2887f3e 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,7 +1,13 @@
 TODO
 ====
 
+In master branch, after merging to master:
+
 * Enable web page after merging.
+* Change README to link to the repo version of the logo.
+
+In development branch:
+
 * Turn the benchmarking script at pystache/tests/benchmark.py into a command in pystache/commands, or
   make it a subcommand of one of the existing commands (i.e. using a command argument).
 * Provide support for logging in at least one of the commands.
diff --git a/gh/images/logo_phillips.png b/gh/images/logo_phillips.png
new file mode 100644
index 0000000..7491901
--- /dev/null
+++ b/gh/images/logo_phillips.png