Merge branch 'master' of https://github.com/SpaceKookie/nest

2 files changed, 26 insertions, 33 deletions

diff --git a/LICENSE b/LICENSE
index d6a9326..8d41b1d 100755
--- a/LICENSE
+++ b/LICENSE
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 
@@ -338,3 +339,26 @@ consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
 
+=======
+MIT License
+
+Copyright (c) 2017 Katharina
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+>>>>>>> da7e92038ca43280012283c69e892f0f5a9e6958
diff --git a/README.md b/README.md
index 5c2dc5d..5e6a857 100755
--- a/README.md
+++ b/README.md
@@ -1,39 +1,8 @@
 # Nest
 
-Nest is a theme for [Pelican](http://getpelican.com) 3.5, a static site generator written in Python.
-
-I initially created this theme for [my blog](http://www.molivier.com), but now the theme is supposed to be generic enough to have its own repository.
-
-## Screenshots
-
-### Homepage
-
-![Nest Index View](homepage.png)
-
-### Homepage with background
-
-![Nest Article View](homepage-background.png)
-
-Add a background image by configuring `NEST_HEADER_IMAGES` parameter in your pelican.conf. Image should be located in `content/images` directory.
-
-### Article
-
-![Nest Index View](article.png)
-
-### Article or page with background
-
-![Nest Article View](article-background.png)
-
-Add a background image by adding `Illustration` custom parameter in your markdown article or page. Image should be located in `content/images` directory.
-
-	Title: Ubuntu Install
-	Date: 2015-02-18 16:00
-	Category: server
-	Tags: ubuntu, kernel
-	Slug: ubuntu-install
-	Author: Matthieu OLIVIER
-	Illustration: background.jpg
+This is my very heavily customised website theme for [spacekookie.de](https://spacekookie.de). Not sure why I keep this public as it will probably never be any good for anyone. But oh well ¯\\\_(ツ)_/¯
 
+This is a fork that I created as it's own repository. The original is from [https://github.com/molivier/nest](https://github.com/molivier/nest)
 
 ## Features