Finished theme merge

f1df7d71 · Jake Drahos · 5e398a34 · f1df7d71 · f1df7d71 · f1df7d71
Commit f1df7d71 authored 8 years ago by Jake Drahos
--- a/LICENSE
+++ b/LICENSE
--- a/README.md
+++ b/README.md
--- a/_config.yml
+++ b/_config.yml
--- a/_includes/footer.html
+++ b/_includes/footer.html
--- a/_includes/github-ribbon.html
+++ b/_includes/github-ribbon.html
--- a/_includes/head.html
+++ b/_includes/head.html
--- a/_includes/icon-github.html
+++ b/_includes/icon-github.html
--- a/_includes/icon-twitter.html
+++ b/_includes/icon-twitter.html
--- a/_includes/navigation.html
+++ b/_includes/navigation.html
--- a/_layouts/default.html
+++ b/_layouts/default.html
--- a/_layouts/post.html
+++ b/_layouts/post.html
--- a/_posts/2013-12-23-helloworld.md
+++ b/_posts/2013-12-23-helloworld.md
--- a/_posts/2014-01-15-xml.md
+++ b/_posts/2014-01-15-xml.md
--- a/_posts/2014-12-23-foreign-link.md
+++ b/_posts/2014-12-23-foreign-link.md
--- a/_sass/_highlight.scss
+++ b/_sass/_highlight.scss
--- a/_sass/_styles.scss
+++ b/_sass/_styles.scss
--- a/css/main.scss
+++ b/css/main.scss
--- a/docs.md
+++ b/docs.md
--- a/examples.html
+++ b/examples.html
--- a/feed.xml
+++ b/feed.xml