diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02e5fdc..0452183 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # 1.0.0 (2017-02-23)
 
 This release is a special one since it sets up in the path of a better development environment. Although it's far from
@@ -43,3 +44,7 @@ to use the library as before.
 - Transform the library into an object.
 - `.tabs` removed.
 - `webslides-lite.js` removed.
+
+# 0.1.0 (2017-01-08)
+
+- Initial release.
diff --git a/error.html b/error.html
index 434cc22..2e19a39 100644
--- a/error.html
+++ b/error.html
@@ -80,7 +80,7 @@
     <!-- end main --> 
 
     <!-- svg-icons.js is optional (fontastic.me - Font Awesome as svg icons) -->
-    <script defer  src="static/js/svg-icons.js"></script>
+    <script defer src="static/js/svg-icons.js"></script>
     
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/static/css/base.css b/static/css/base.css
index 73f6a15..ed32ea4 100644
--- a/static/css/base.css
+++ b/static/css/base.css
@@ -1308,7 +1308,8 @@ nav.navbar ul li {
     flex-flow: column wrap;
     padding: 0;
   }
-  nav.navbar li a{justify-content:flex-start;
+  nav.navbar li a {
+    justify-content:flex-start;
   }
 }