diff --git a/Blerp/index.html b/Blerp/index.html
deleted file mode 100644
index 4c7e530bd65628e22ac0b4ffe1383dcb062ed195..0000000000000000000000000000000000000000
--- a/Blerp/index.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
- <meta charset="utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <title>Assignment 4 Exercise 3</title>
- <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
- <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/fancyapps/fancybox@3.5.7/dist/jquery.fancybox.min.css" />
- <link rel="stylesheet" href="style.css">
-
-
- <script src="https://code.jquery.com/jquery-1.12.4.js"></script>
- <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
- <script src="https://cdnjs.cloudflare.com/ajax/libs/fancybox/3.5.7/jquery.fancybox.min.js" integrity="sha512-uURl+ZXMBrF4AwGaWmEetzrd+J5/8NRkWAvJx5sbPSSuOb0bZLqf+tOzniObO00BjHa/dD7gub9oCGMLPQHtQA==" crossorigin="anonymous"></script>
- <script src="script.js"></script>
-
-
-
-
-
-
-</head>
-<body>
-
- <div id = "container">
-
- <div id = "droppable-div">
- <div class="droppable ui-widget-header">
- <img class="myImage" src=""/>
- </div>
-
- <div class="droppable ui-widget-header">
- <img class="myImage" src="" />
- </div>
-
- <div class="droppable ui-widget-header">
- <img class="myImage" src=""/>
- </div>
-
- </div>
-
-<div class="table-container">
- <table id = "myTable" class="tablesorter">
- <thead>
- <tr>
- <th>Name</th>
- <th>ID</th>
- <th>Last shipment</th>
- <th>In stock</th>
- <th>Picture</th>
- </tr>
- </thead>
-
- <tbody>
- <tr>
- <td>Fish</td>
- <td>1</td>
- <td>2013-11-16</td>
- <td>100</td>
- <td><div class="draggable ui-widget-content" src = "/Exercise 1/images/image1-small.jpg">
- <img src = "/Exercise 1/images/image1-small.jpg"/>
- </div></td>
- </tr>
- <tr>
- <td>Corn</td>
- <td>2</td>
- <td>2013-11-16</td>
- <td>40</td>
- <td><div class="draggable ui-widget-content" src = "/Exercise 1/images/image2-small.jpg" >
- <img src = "/Exercise 1/images/image2-small.jpg"/>
- </div></td>
- </tr>
- <tr>
- <td>Watermelon</td>
- <td>3</td>
- <td>2013-11-16</td>
- <td>54</td>
- <td><div class="draggable ui-widget-content" src = "/Exercise 1/images/image3-small.jpg">
- <img src = "/Exercise 1/images/image3-small.jpg"/>
- </div></td>
- </tr>
- <tr>
- <td>Egg</td>
- <td>4</td>
- <td>2013-11-16</td>
- <td>32</td>
- <td><div class="draggable ui-widget-content" src = "/Exercise 1/images/image4-small.jpg">
- <img src = "/Exercise 1/images/image4-small.jpg"/>
- </div></td>
- </tr>
- </tbody>
- </table>
-</div>
-
-</div>
-</div>
-
\ No newline at end of file
diff --git a/Blerp/script.js b/Blerp/script.js
deleted file mode 100644
index 6d59c9795ca82c72112b9d8e18426e51aa82b1f6..0000000000000000000000000000000000000000
--- a/Blerp/script.js
+++ /dev/null
@@ -1,30 +0,0 @@
-$( document ).ready(function() {
-
-
-$( function() {
-
-
- $(".draggable").draggable({
- helper: "clone",
- revert: "invalid"
- });
-
- $(".droppable").droppable({
-
- drop: function(event, ui) {
- /* $( this )
- .find( "img" )
- $('img', this).attr("src", ui.draggable.attr("src"));*/
- $(this)
- /*.find("a")
- .html('<a href=""><img src="" /></a>');*/
- $(this).attr("a href", ui.draggable.attr("src"));
- $(this).attr("img src", ui.draggable.attr("src"));
- /*$(this).attr("data-fancybox", "gallery");
-
- }
- });
-
-});
-});
-
diff --git a/Blerp/style.css b/Blerp/style.css
deleted file mode 100644
index 0e22f1477d58f85846b461b4c183bfd72d2d0e51..0000000000000000000000000000000000000000
--- a/Blerp/style.css
+++ /dev/null
@@ -1,58 +0,0 @@
-#container {
-display:flex;
-justify-content: center;
-align-items: center;
-flex-direction: column;
-
-}
-
-.draggable {
- width: 100px;
- height: 100px;
- padding: 0.1em;
- float: left;
- margin: 20px 10px 10px 40px;
-}
-.droppable {
- width: 150px;
- height: 150px;
- padding: 0.1em;
- float: left;
- margin: 10px; }
-
-
-#droppable-div {
- margin-bottom: 50px;
-}
-
-.ui-widget-content img {
- width: 100px;
- height: 100px;
-}
-
-.table-container {
-width: 600px;
-height: 500px;
-}
-
-#myTable {
- font-family: arial, sans-serif;
- border-collapse: collapse;
- width: 100%;
- height: 50%;
-
- }
-
-#myTable td, th {
- border: 1px solid #dddddd;
- text-align: left;
- }
-
- #myTable tr:nth-child(even) {
- background-color: #c4bdbd;
- }
-
- .myImage {
- width: 100%;
- height: 100%;
- }
\ No newline at end of file
diff --git a/Exercise 1/accordion.html b/Exercise 1+2/accordion.html
similarity index 100%
rename from Exercise 1/accordion.html
rename to Exercise 1+2/accordion.html
diff --git a/Exercise 1/desoslide-2.2.0/.gitignore b/Exercise 1+2/desoslide-2.2.0/.gitignore
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/.gitignore
rename to Exercise 1+2/desoslide-2.2.0/.gitignore
diff --git a/Exercise 1/desoslide-2.2.0/.jscsrc b/Exercise 1+2/desoslide-2.2.0/.jscsrc
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/.jscsrc
rename to Exercise 1+2/desoslide-2.2.0/.jscsrc
diff --git a/Exercise 1/desoslide-2.2.0/.npmignore b/Exercise 1+2/desoslide-2.2.0/.npmignore
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/.npmignore
rename to Exercise 1+2/desoslide-2.2.0/.npmignore
diff --git a/Exercise 1/desoslide-2.2.0/.travis.yml b/Exercise 1+2/desoslide-2.2.0/.travis.yml
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/.travis.yml
rename to Exercise 1+2/desoslide-2.2.0/.travis.yml
diff --git a/Exercise 1/desoslide-2.2.0/CONTRIBUTING.md b/Exercise 1+2/desoslide-2.2.0/CONTRIBUTING.md
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/CONTRIBUTING.md
rename to Exercise 1+2/desoslide-2.2.0/CONTRIBUTING.md
diff --git a/Exercise 1/desoslide-2.2.0/LICENSE.md b/Exercise 1+2/desoslide-2.2.0/LICENSE.md
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/LICENSE.md
rename to Exercise 1+2/desoslide-2.2.0/LICENSE.md
diff --git a/Exercise 1/desoslide-2.2.0/README.md b/Exercise 1+2/desoslide-2.2.0/README.md
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/README.md
rename to Exercise 1+2/desoslide-2.2.0/README.md
diff --git a/Exercise 1/desoslide-2.2.0/angularjs/desoslide.directive.js b/Exercise 1+2/desoslide-2.2.0/angularjs/desoslide.directive.js
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/angularjs/desoslide.directive.js
rename to Exercise 1+2/desoslide-2.2.0/angularjs/desoslide.directive.js
diff --git a/Exercise 1/desoslide-2.2.0/angularjs/usage.html b/Exercise 1+2/desoslide-2.2.0/angularjs/usage.html
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/angularjs/usage.html
rename to Exercise 1+2/desoslide-2.2.0/angularjs/usage.html
diff --git a/Exercise 1/desoslide-2.2.0/bower.json b/Exercise 1+2/desoslide-2.2.0/bower.json
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/bower.json
rename to Exercise 1+2/desoslide-2.2.0/bower.json
diff --git a/Exercise 1/desoslide-2.2.0/desoslide.jquery.json b/Exercise 1+2/desoslide-2.2.0/desoslide.jquery.json
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/desoslide.jquery.json
rename to Exercise 1+2/desoslide-2.2.0/desoslide.jquery.json
diff --git a/Exercise 1/desoslide-2.2.0/dist/css/jquery.desoslide.css b/Exercise 1+2/desoslide-2.2.0/dist/css/jquery.desoslide.css
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/dist/css/jquery.desoslide.css
rename to Exercise 1+2/desoslide-2.2.0/dist/css/jquery.desoslide.css
diff --git a/Exercise 1/desoslide-2.2.0/dist/css/jquery.desoslide.min.css b/Exercise 1+2/desoslide-2.2.0/dist/css/jquery.desoslide.min.css
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/dist/css/jquery.desoslide.min.css
rename to Exercise 1+2/desoslide-2.2.0/dist/css/jquery.desoslide.min.css
diff --git a/Exercise 1/desoslide-2.2.0/dist/img/desoslide_controls.png b/Exercise 1+2/desoslide-2.2.0/dist/img/desoslide_controls.png
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/dist/img/desoslide_controls.png
rename to Exercise 1+2/desoslide-2.2.0/dist/img/desoslide_controls.png
diff --git a/Exercise 1/desoslide-2.2.0/dist/js/jquery.desoslide.min.js b/Exercise 1+2/desoslide-2.2.0/dist/js/jquery.desoslide.min.js
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/dist/js/jquery.desoslide.min.js
rename to Exercise 1+2/desoslide-2.2.0/dist/js/jquery.desoslide.min.js
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/css/app/main.css b/Exercise 1+2/desoslide-2.2.0/doc/assets/css/app/main.css
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/css/app/main.css
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/css/app/main.css
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/css/app/views/demo.css b/Exercise 1+2/desoslide-2.2.0/doc/assets/css/app/views/demo.css
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/css/app/views/demo.css
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/css/app/views/demo.css
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/css/app/views/documentation.css b/Exercise 1+2/desoslide-2.2.0/doc/assets/css/app/views/documentation.css
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/css/app/views/documentation.css
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/css/app/views/documentation.css
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/css/app/views/home.css b/Exercise 1+2/desoslide-2.2.0/doc/assets/css/app/views/home.css
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/css/app/views/home.css
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/css/app/views/home.css
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/css/app/views/release-notes.css b/Exercise 1+2/desoslide-2.2.0/doc/assets/css/app/views/release-notes.css
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/css/app/views/release-notes.css
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/css/app/views/release-notes.css
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/css/app/views/tests.css b/Exercise 1+2/desoslide-2.2.0/doc/assets/css/app/views/tests.css
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/css/app/views/tests.css
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/css/app/views/tests.css
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/css/vendor/animate/animate.min.css b/Exercise 1+2/desoslide-2.2.0/doc/assets/css/vendor/animate/animate.min.css
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/css/vendor/animate/animate.min.css
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/css/vendor/animate/animate.min.css
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/css/vendor/magic/magic.min.css b/Exercise 1+2/desoslide-2.2.0/doc/assets/css/vendor/magic/magic.min.css
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/css/vendor/magic/magic.min.css
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/css/vendor/magic/magic.min.css
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/fonts/font-awesome/FontAwesome.otf b/Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/font-awesome/FontAwesome.otf
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/fonts/font-awesome/FontAwesome.otf
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/font-awesome/FontAwesome.otf
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/fonts/font-awesome/fontawesome-webfont.eot b/Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/font-awesome/fontawesome-webfont.eot
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/fonts/font-awesome/fontawesome-webfont.eot
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/font-awesome/fontawesome-webfont.eot
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/fonts/font-awesome/fontawesome-webfont.svg b/Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/font-awesome/fontawesome-webfont.svg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/fonts/font-awesome/fontawesome-webfont.svg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/font-awesome/fontawesome-webfont.svg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/fonts/font-awesome/fontawesome-webfont.ttf b/Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/font-awesome/fontawesome-webfont.ttf
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/fonts/font-awesome/fontawesome-webfont.ttf
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/font-awesome/fontawesome-webfont.ttf
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/fonts/font-awesome/fontawesome-webfont.woff b/Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/font-awesome/fontawesome-webfont.woff
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/fonts/font-awesome/fontawesome-webfont.woff
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/font-awesome/fontawesome-webfont.woff
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/fonts/open-sans/LICENSE.txt b/Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/open-sans/LICENSE.txt
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/fonts/open-sans/LICENSE.txt
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/open-sans/LICENSE.txt
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/fonts/open-sans/light/open-sans.eot b/Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/open-sans/light/open-sans.eot
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/fonts/open-sans/light/open-sans.eot
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/open-sans/light/open-sans.eot
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/fonts/open-sans/light/open-sans.svg b/Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/open-sans/light/open-sans.svg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/fonts/open-sans/light/open-sans.svg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/open-sans/light/open-sans.svg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/fonts/open-sans/light/open-sans.ttf b/Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/open-sans/light/open-sans.ttf
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/fonts/open-sans/light/open-sans.ttf
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/open-sans/light/open-sans.ttf
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/fonts/open-sans/light/open-sans.woff b/Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/open-sans/light/open-sans.woff
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/fonts/open-sans/light/open-sans.woff
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/open-sans/light/open-sans.woff
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/fonts/open-sans/regular/open-sans.eot b/Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/open-sans/regular/open-sans.eot
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/fonts/open-sans/regular/open-sans.eot
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/open-sans/regular/open-sans.eot
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/fonts/open-sans/regular/open-sans.svg b/Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/open-sans/regular/open-sans.svg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/fonts/open-sans/regular/open-sans.svg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/open-sans/regular/open-sans.svg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/fonts/open-sans/regular/open-sans.ttf b/Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/open-sans/regular/open-sans.ttf
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/fonts/open-sans/regular/open-sans.ttf
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/open-sans/regular/open-sans.ttf
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/fonts/open-sans/regular/open-sans.woff b/Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/open-sans/regular/open-sans.woff
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/fonts/open-sans/regular/open-sans.woff
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/open-sans/regular/open-sans.woff
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/fonts/open-sans/semibold/open-sans.eot b/Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/open-sans/semibold/open-sans.eot
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/fonts/open-sans/semibold/open-sans.eot
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/open-sans/semibold/open-sans.eot
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/fonts/open-sans/semibold/open-sans.svg b/Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/open-sans/semibold/open-sans.svg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/fonts/open-sans/semibold/open-sans.svg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/open-sans/semibold/open-sans.svg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/fonts/open-sans/semibold/open-sans.ttf b/Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/open-sans/semibold/open-sans.ttf
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/fonts/open-sans/semibold/open-sans.ttf
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/open-sans/semibold/open-sans.ttf
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/fonts/open-sans/semibold/open-sans.woff b/Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/open-sans/semibold/open-sans.woff
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/fonts/open-sans/semibold/open-sans.woff
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/open-sans/semibold/open-sans.woff
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/fonts/pictonic/pictonic.eot b/Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/pictonic/pictonic.eot
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/fonts/pictonic/pictonic.eot
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/pictonic/pictonic.eot
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/fonts/pictonic/pictonic.svg b/Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/pictonic/pictonic.svg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/fonts/pictonic/pictonic.svg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/pictonic/pictonic.svg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/fonts/pictonic/pictonic.svgz b/Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/pictonic/pictonic.svgz
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/fonts/pictonic/pictonic.svgz
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/pictonic/pictonic.svgz
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/fonts/pictonic/pictonic.ttf b/Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/pictonic/pictonic.ttf
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/fonts/pictonic/pictonic.ttf
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/pictonic/pictonic.ttf
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/fonts/pictonic/pictonic.woff b/Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/pictonic/pictonic.woff
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/fonts/pictonic/pictonic.woff
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/fonts/pictonic/pictonic.woff
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/core/animate.png b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/core/animate.png
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/core/animate.png
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/core/animate.png
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/core/jquery.png b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/core/jquery.png
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/core/jquery.png
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/core/jquery.png
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/core/magic.png b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/core/magic.png
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/core/magic.png
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/core/magic.png
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/attack.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/attack.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/attack.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/attack.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/attack_thumb.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/attack_thumb.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/attack_thumb.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/attack_thumb.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/bick_buck_bunny.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/bick_buck_bunny.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/bick_buck_bunny.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/bick_buck_bunny.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/bick_buck_bunny_thumb.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/bick_buck_bunny_thumb.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/bick_buck_bunny_thumb.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/bick_buck_bunny_thumb.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/bird.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/bird.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/bird.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/bird.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/bird_thumb.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/bird_thumb.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/bird_thumb.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/bird_thumb.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/bunny_bow.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/bunny_bow.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/bunny_bow.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/bunny_bow.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/bunny_bow_thumb.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/bunny_bow_thumb.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/bunny_bow_thumb.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/bunny_bow_thumb.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/evil_frank.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/evil_frank.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/evil_frank.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/evil_frank.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/evil_frank_thumb.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/evil_frank_thumb.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/evil_frank_thumb.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/evil_frank_thumb.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/its_a_trap.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/its_a_trap.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/its_a_trap.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/its_a_trap.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/its_a_trap_thumb.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/its_a_trap_thumb.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/its_a_trap_thumb.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/its_a_trap_thumb.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/rinky.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/rinky.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/rinky.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/rinky.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/rinky_thumb.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/rinky_thumb.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/rinky_thumb.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/rinky_thumb.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/rodents.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/rodents.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/rodents.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/rodents.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/rodents_thumb.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/rodents_thumb.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo1/rodents_thumb.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo1/rodents_thumb.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo2/bird.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo2/bird.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo2/bird.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo2/bird.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo2/bird_thumb.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo2/bird_thumb.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo2/bird_thumb.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo2/bird_thumb.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo2/butterfly.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo2/butterfly.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo2/butterfly.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo2/butterfly.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo2/butterfly_thumb.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo2/butterfly_thumb.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo2/butterfly_thumb.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo2/butterfly_thumb.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo2/flower.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo2/flower.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo2/flower.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo2/flower.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo2/flower_thumb.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo2/flower_thumb.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo2/flower_thumb.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo2/flower_thumb.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo2/rose.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo2/rose.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo2/rose.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo2/rose.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo2/rose_thumb.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo2/rose_thumb.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo2/rose_thumb.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo2/rose_thumb.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo3/bridge.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo3/bridge.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo3/bridge.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo3/bridge.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo3/bridge_thumb.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo3/bridge_thumb.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo3/bridge_thumb.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo3/bridge_thumb.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo3/building.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo3/building.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo3/building.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo3/building.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo3/building_thumb.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo3/building_thumb.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo3/building_thumb.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo3/building_thumb.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo3/city.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo3/city.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo3/city.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo3/city.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo3/city_thumb.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo3/city_thumb.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo3/city_thumb.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo3/city_thumb.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo3/eiffel.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo3/eiffel.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo3/eiffel.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo3/eiffel.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo3/eiffel_thumb.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo3/eiffel_thumb.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo3/eiffel_thumb.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo3/eiffel_thumb.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo4/dog.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo4/dog.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo4/dog.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo4/dog.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo4/dog_thumb.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo4/dog_thumb.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo4/dog_thumb.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo4/dog_thumb.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo4/lynx.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo4/lynx.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo4/lynx.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo4/lynx.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo4/lynx_thumb.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo4/lynx_thumb.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo4/lynx_thumb.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo4/lynx_thumb.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo4/tiger.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo4/tiger.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo4/tiger.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo4/tiger.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo4/tiger_thumb.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo4/tiger_thumb.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo4/tiger_thumb.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo4/tiger_thumb.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo4/tortoise.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo4/tortoise.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo4/tortoise.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo4/tortoise.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo4/tortoise_thumb.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo4/tortoise_thumb.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo4/tortoise_thumb.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo4/tortoise_thumb.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo5/dolmens.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo5/dolmens.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo5/dolmens.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo5/dolmens.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo5/dolmens_thumb.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo5/dolmens_thumb.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo5/dolmens_thumb.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo5/dolmens_thumb.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo5/lighthouse.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo5/lighthouse.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo5/lighthouse.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo5/lighthouse.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo5/lighthouse_thumb.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo5/lighthouse_thumb.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo5/lighthouse_thumb.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo5/lighthouse_thumb.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo5/road.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo5/road.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo5/road.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo5/road.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo5/road_thumb.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo5/road_thumb.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo5/road_thumb.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo5/road_thumb.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo5/wheat.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo5/wheat.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo5/wheat.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo5/wheat.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo5/wheat_thumb.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo5/wheat_thumb.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/demos/demo5/wheat_thumb.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/demos/demo5/wheat_thumb.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/favicon.png b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/favicon.png
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/favicon.png
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/favicon.png
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/flat-ui/gift.png b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/flat-ui/gift.png
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/flat-ui/gift.png
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/flat-ui/gift.png
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/flat-ui/goal.png b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/flat-ui/goal.png
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/flat-ui/goal.png
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/flat-ui/goal.png
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/flat-ui/infinite.png b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/flat-ui/infinite.png
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/flat-ui/infinite.png
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/flat-ui/infinite.png
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/flat-ui/picture.png b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/flat-ui/picture.png
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/flat-ui/picture.png
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/flat-ui/picture.png
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/flat-ui/settings.png b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/flat-ui/settings.png
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/flat-ui/settings.png
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/flat-ui/settings.png
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/flat-ui/tests.png b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/flat-ui/tests.png
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/flat-ui/tests.png
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/flat-ui/tests.png
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/team/jaoued.png b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/team/jaoued.png
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/team/jaoued.png
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/team/jaoued.png
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/img/team/sylvain.jpg b/Exercise 1+2/desoslide-2.2.0/doc/assets/img/team/sylvain.jpg
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/img/team/sylvain.jpg
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/img/team/sylvain.jpg
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/js/app/demo.js b/Exercise 1+2/desoslide-2.2.0/doc/assets/js/app/demo.js
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/js/app/demo.js
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/js/app/demo.js
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/js/app/documentation.js b/Exercise 1+2/desoslide-2.2.0/doc/assets/js/app/documentation.js
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/js/app/documentation.js
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/js/app/documentation.js
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/js/app/home.js b/Exercise 1+2/desoslide-2.2.0/doc/assets/js/app/home.js
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/js/app/home.js
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/js/app/home.js
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/js/app/release-notes.js b/Exercise 1+2/desoslide-2.2.0/doc/assets/js/app/release-notes.js
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/js/app/release-notes.js
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/js/app/release-notes.js
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/js/vendor/bootstrap/bootstrap.min.js b/Exercise 1+2/desoslide-2.2.0/doc/assets/js/vendor/bootstrap/bootstrap.min.js
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/js/vendor/bootstrap/bootstrap.min.js
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/js/vendor/bootstrap/bootstrap.min.js
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/js/vendor/highlight/highlight.pack.js b/Exercise 1+2/desoslide-2.2.0/doc/assets/js/vendor/highlight/highlight.pack.js
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/js/vendor/highlight/highlight.pack.js
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/js/vendor/highlight/highlight.pack.js
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/js/vendor/html5shiv/html5shiv.min.js b/Exercise 1+2/desoslide-2.2.0/doc/assets/js/vendor/html5shiv/html5shiv.min.js
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/js/vendor/html5shiv/html5shiv.min.js
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/js/vendor/html5shiv/html5shiv.min.js
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/js/vendor/jquery/jquery.js b/Exercise 1+2/desoslide-2.2.0/doc/assets/js/vendor/jquery/jquery.js
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/js/vendor/jquery/jquery.js
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/js/vendor/jquery/jquery.js
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/js/vendor/wow.min.js b/Exercise 1+2/desoslide-2.2.0/doc/assets/js/vendor/wow.min.js
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/js/vendor/wow.min.js
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/js/vendor/wow.min.js
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/app/components/fonts.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/components/fonts.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/app/components/fonts.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/components/fonts.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/app/components/mixins.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/components/mixins.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/app/components/mixins.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/components/mixins.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/app/components/modules/button.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/components/modules/button.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/app/components/modules/button.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/components/modules/button.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/app/components/modules/dialog.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/components/modules/dialog.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/app/components/modules/dialog.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/components/modules/dialog.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/app/components/modules/form.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/components/modules/form.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/app/components/modules/form.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/components/modules/form.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/app/components/modules/jumbotron.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/components/modules/jumbotron.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/app/components/modules/jumbotron.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/components/modules/jumbotron.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/app/components/modules/label.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/components/modules/label.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/app/components/modules/label.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/components/modules/label.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/app/components/modules/navbar.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/components/modules/navbar.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/app/components/modules/navbar.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/components/modules/navbar.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/app/components/modules/tomorrow-night.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/components/modules/tomorrow-night.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/app/components/modules/tomorrow-night.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/components/modules/tomorrow-night.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/app/components/typography.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/components/typography.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/app/components/typography.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/components/typography.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/app/components/variables.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/components/variables.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/app/components/variables.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/components/variables.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/app/layouts/body.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/layouts/body.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/app/layouts/body.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/layouts/body.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/app/layouts/footer.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/layouts/footer.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/app/layouts/footer.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/layouts/footer.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/app/layouts/header.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/layouts/header.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/app/layouts/header.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/layouts/header.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/app/main.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/main.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/app/main.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/main.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/app/views/demo.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/views/demo.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/app/views/demo.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/views/demo.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/app/views/documentation.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/views/documentation.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/app/views/documentation.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/views/documentation.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/app/views/home.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/views/home.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/app/views/home.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/views/home.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/app/views/release-notes.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/views/release-notes.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/app/views/release-notes.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/views/release-notes.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/app/views/tests.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/views/tests.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/app/views/tests.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/app/views/tests.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/.csscomb.json b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/.csscomb.json
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/.csscomb.json
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/.csscomb.json
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/.csslintrc b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/.csslintrc
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/.csslintrc
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/.csslintrc
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/alerts.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/alerts.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/alerts.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/alerts.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/badges.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/badges.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/badges.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/badges.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/bootstrap.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/bootstrap.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/bootstrap.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/bootstrap.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/breadcrumbs.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/breadcrumbs.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/breadcrumbs.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/breadcrumbs.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/button-groups.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/button-groups.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/button-groups.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/button-groups.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/buttons.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/buttons.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/buttons.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/buttons.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/carousel.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/carousel.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/carousel.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/carousel.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/close.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/close.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/close.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/close.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/code.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/code.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/code.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/code.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/component-animations.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/component-animations.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/component-animations.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/component-animations.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/dropdowns.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/dropdowns.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/dropdowns.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/dropdowns.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/forms.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/forms.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/forms.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/forms.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/glyphicons.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/glyphicons.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/glyphicons.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/glyphicons.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/grid.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/grid.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/grid.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/grid.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/input-groups.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/input-groups.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/input-groups.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/input-groups.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/jumbotron.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/jumbotron.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/jumbotron.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/jumbotron.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/labels.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/labels.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/labels.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/labels.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/list-group.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/list-group.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/list-group.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/list-group.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/media.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/media.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/media.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/media.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/alerts.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/alerts.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/alerts.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/alerts.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/background-variant.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/background-variant.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/background-variant.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/background-variant.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/border-radius.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/border-radius.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/border-radius.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/border-radius.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/buttons.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/buttons.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/buttons.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/buttons.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/center-block.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/center-block.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/center-block.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/center-block.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/clearfix.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/clearfix.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/clearfix.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/clearfix.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/forms.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/forms.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/forms.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/forms.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/gradients.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/gradients.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/gradients.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/gradients.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/grid-framework.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/grid-framework.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/grid-framework.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/grid-framework.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/grid.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/grid.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/grid.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/grid.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/hide-text.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/hide-text.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/hide-text.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/hide-text.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/image.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/image.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/image.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/image.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/labels.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/labels.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/labels.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/labels.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/list-group.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/list-group.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/list-group.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/list-group.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/nav-divider.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/nav-divider.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/nav-divider.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/nav-divider.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/nav-vertical-align.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/nav-vertical-align.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/nav-vertical-align.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/nav-vertical-align.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/opacity.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/opacity.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/opacity.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/opacity.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/pagination.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/pagination.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/pagination.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/pagination.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/panels.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/panels.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/panels.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/panels.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/progress-bar.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/progress-bar.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/progress-bar.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/progress-bar.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/reset-filter.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/reset-filter.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/reset-filter.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/reset-filter.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/resize.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/resize.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/resize.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/resize.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/responsive-visibility.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/responsive-visibility.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/responsive-visibility.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/responsive-visibility.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/size.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/size.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/size.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/size.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/tab-focus.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/tab-focus.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/tab-focus.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/tab-focus.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/table-row.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/table-row.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/table-row.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/table-row.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/text-emphasis.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/text-emphasis.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/text-emphasis.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/text-emphasis.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/text-overflow.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/text-overflow.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/text-overflow.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/text-overflow.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/vendor-prefixes.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/vendor-prefixes.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/vendor-prefixes.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/mixins/vendor-prefixes.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/modals.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/modals.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/modals.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/modals.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/navbar.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/navbar.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/navbar.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/navbar.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/navs.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/navs.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/navs.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/navs.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/normalize.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/normalize.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/normalize.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/normalize.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/pager.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/pager.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/pager.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/pager.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/pagination.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/pagination.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/pagination.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/pagination.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/panels.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/panels.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/panels.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/panels.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/popovers.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/popovers.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/popovers.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/popovers.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/print.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/print.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/print.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/print.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/progress-bars.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/progress-bars.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/progress-bars.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/progress-bars.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/responsive-embed.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/responsive-embed.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/responsive-embed.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/responsive-embed.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/responsive-utilities.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/responsive-utilities.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/responsive-utilities.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/responsive-utilities.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/scaffolding.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/scaffolding.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/scaffolding.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/scaffolding.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/tables.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/tables.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/tables.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/tables.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/theme.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/theme.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/theme.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/theme.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/thumbnails.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/thumbnails.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/thumbnails.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/thumbnails.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/tooltip.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/tooltip.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/tooltip.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/tooltip.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/type.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/type.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/type.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/type.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/utilities.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/utilities.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/utilities.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/utilities.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/variables.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/variables.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/variables.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/variables.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/wells.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/wells.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/wells.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/bootstrap/wells.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/demo.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/demo.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/demo.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/demo.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/docs.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/docs.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/docs.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/docs.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/flat-ui.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/flat-ui.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/flat-ui.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/flat-ui.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/mixins.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/mixins.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/mixins.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/mixins.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/button-groups.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/button-groups.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/button-groups.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/button-groups.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/buttons.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/buttons.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/buttons.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/buttons.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/caret.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/caret.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/caret.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/caret.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/checkbox-and-radio.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/checkbox-and-radio.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/checkbox-and-radio.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/checkbox-and-radio.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/code.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/code.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/code.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/code.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/dropdown.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/dropdown.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/dropdown.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/dropdown.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/footer.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/footer.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/footer.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/footer.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/forms.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/forms.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/forms.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/forms.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/glyphicons.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/glyphicons.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/glyphicons.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/glyphicons.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/input-groups.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/input-groups.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/input-groups.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/input-groups.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/input-icons.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/input-icons.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/input-icons.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/input-icons.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/local-fonts.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/local-fonts.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/local-fonts.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/local-fonts.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/login.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/login.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/login.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/login.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/navbar.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/navbar.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/navbar.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/navbar.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/pager.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/pager.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/pager.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/pager.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/pagination.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/pagination.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/pagination.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/pagination.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/palette.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/palette.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/palette.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/palette.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/progress-bars.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/progress-bars.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/progress-bars.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/progress-bars.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/scaffolding.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/scaffolding.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/scaffolding.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/scaffolding.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/select.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/select.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/select.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/select.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/share.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/share.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/share.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/share.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/slider.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/slider.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/slider.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/slider.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/switch.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/switch.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/switch.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/switch.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/tagsinput.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/tagsinput.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/tagsinput.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/tagsinput.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/thumbnails.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/thumbnails.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/thumbnails.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/thumbnails.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/tile.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/tile.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/tile.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/tile.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/todo.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/todo.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/todo.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/todo.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/tooltip.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/tooltip.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/tooltip.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/tooltip.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/type.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/type.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/type.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/type.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/typeahead.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/typeahead.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/typeahead.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/typeahead.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/video.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/video.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/video.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/modules/video.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/spaces.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/spaces.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/spaces.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/spaces.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/variables.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/variables.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/variables.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/flat-ui/variables.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/bordered-pulled.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/bordered-pulled.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/bordered-pulled.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/bordered-pulled.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/core.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/core.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/core.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/core.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/fixed-width.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/fixed-width.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/fixed-width.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/fixed-width.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/font-awesome.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/font-awesome.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/font-awesome.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/font-awesome.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/icons.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/icons.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/icons.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/icons.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/larger.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/larger.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/larger.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/larger.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/list.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/list.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/list.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/list.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/mixins.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/mixins.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/mixins.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/mixins.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/path.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/path.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/path.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/path.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/rotated-flipped.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/rotated-flipped.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/rotated-flipped.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/rotated-flipped.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/spinning.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/spinning.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/spinning.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/spinning.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/stacked.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/stacked.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/stacked.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/stacked.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/variables.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/variables.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/variables.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/font-awesome/variables.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/github/github.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/github/github.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/github/github.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/github/github.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/pictonic/pictonic.less b/Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/pictonic/pictonic.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/assets/less/vendor/pictonic/pictonic.less
rename to Exercise 1+2/desoslide-2.2.0/doc/assets/less/vendor/pictonic/pictonic.less
diff --git a/Exercise 1/desoslide-2.2.0/doc/demo.html b/Exercise 1+2/desoslide-2.2.0/doc/demo.html
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/demo.html
rename to Exercise 1+2/desoslide-2.2.0/doc/demo.html
diff --git a/Exercise 1/desoslide-2.2.0/doc/index.html b/Exercise 1+2/desoslide-2.2.0/doc/index.html
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/index.html
rename to Exercise 1+2/desoslide-2.2.0/doc/index.html
diff --git a/Exercise 1/desoslide-2.2.0/doc/release-notes.html b/Exercise 1+2/desoslide-2.2.0/doc/release-notes.html
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/doc/release-notes.html
rename to Exercise 1+2/desoslide-2.2.0/doc/release-notes.html
diff --git a/Exercise 1/desoslide-2.2.0/gulpfile.js b/Exercise 1+2/desoslide-2.2.0/gulpfile.js
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/gulpfile.js
rename to Exercise 1+2/desoslide-2.2.0/gulpfile.js
diff --git a/Exercise 1/desoslide-2.2.0/index.html b/Exercise 1+2/desoslide-2.2.0/index.html
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/index.html
rename to Exercise 1+2/desoslide-2.2.0/index.html
diff --git a/Exercise 1/desoslide-2.2.0/package.json b/Exercise 1+2/desoslide-2.2.0/package.json
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/package.json
rename to Exercise 1+2/desoslide-2.2.0/package.json
diff --git a/Exercise 1/desoslide-2.2.0/src/js/jquery.desoslide.js b/Exercise 1+2/desoslide-2.2.0/src/js/jquery.desoslide.js
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/src/js/jquery.desoslide.js
rename to Exercise 1+2/desoslide-2.2.0/src/js/jquery.desoslide.js
diff --git a/Exercise 1/desoslide-2.2.0/src/less/jquery.desoslide.less b/Exercise 1+2/desoslide-2.2.0/src/less/jquery.desoslide.less
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/src/less/jquery.desoslide.less
rename to Exercise 1+2/desoslide-2.2.0/src/less/jquery.desoslide.less
diff --git a/Exercise 1/desoslide-2.2.0/tests/index.html b/Exercise 1+2/desoslide-2.2.0/tests/index.html
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/tests/index.html
rename to Exercise 1+2/desoslide-2.2.0/tests/index.html
diff --git a/Exercise 1/desoslide-2.2.0/tests/qunit/css/qunit.css b/Exercise 1+2/desoslide-2.2.0/tests/qunit/css/qunit.css
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/tests/qunit/css/qunit.css
rename to Exercise 1+2/desoslide-2.2.0/tests/qunit/css/qunit.css
diff --git a/Exercise 1/desoslide-2.2.0/tests/qunit/js/qunit.js b/Exercise 1+2/desoslide-2.2.0/tests/qunit/js/qunit.js
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/tests/qunit/js/qunit.js
rename to Exercise 1+2/desoslide-2.2.0/tests/qunit/js/qunit.js
diff --git a/Exercise 1/desoslide-2.2.0/tests/tests.js b/Exercise 1+2/desoslide-2.2.0/tests/tests.js
similarity index 100%
rename from Exercise 1/desoslide-2.2.0/tests/tests.js
rename to Exercise 1+2/desoslide-2.2.0/tests/tests.js
diff --git a/Exercise 1/home.html b/Exercise 1+2/home.html
similarity index 100%
rename from Exercise 1/home.html
rename to Exercise 1+2/home.html
diff --git a/Exercise 1/image5-small.jpg b/Exercise 1+2/image5-small.jpg
similarity index 100%
rename from Exercise 1/image5-small.jpg
rename to Exercise 1+2/image5-small.jpg
diff --git a/Exercise 1/images/image1-small.jpg b/Exercise 1+2/images/image1-small.jpg
similarity index 100%
rename from Exercise 1/images/image1-small.jpg
rename to Exercise 1+2/images/image1-small.jpg
diff --git a/Exercise 1/images/image1.jpg b/Exercise 1+2/images/image1.jpg
similarity index 100%
rename from Exercise 1/images/image1.jpg
rename to Exercise 1+2/images/image1.jpg
diff --git a/Exercise 1/images/image2-small.jpg b/Exercise 1+2/images/image2-small.jpg
similarity index 100%
rename from Exercise 1/images/image2-small.jpg
rename to Exercise 1+2/images/image2-small.jpg
diff --git a/Exercise 1/images/image2.jpg b/Exercise 1+2/images/image2.jpg
similarity index 100%
rename from Exercise 1/images/image2.jpg
rename to Exercise 1+2/images/image2.jpg
diff --git a/Exercise 1/images/image3-small.jpg b/Exercise 1+2/images/image3-small.jpg
similarity index 100%
rename from Exercise 1/images/image3-small.jpg
rename to Exercise 1+2/images/image3-small.jpg
diff --git a/Exercise 1/images/image3.jpg b/Exercise 1+2/images/image3.jpg
similarity index 100%
rename from Exercise 1/images/image3.jpg
rename to Exercise 1+2/images/image3.jpg
diff --git a/Exercise 1/images/image4-small.jpg b/Exercise 1+2/images/image4-small.jpg
similarity index 100%
rename from Exercise 1/images/image4-small.jpg
rename to Exercise 1+2/images/image4-small.jpg
diff --git a/Exercise 1/images/image4.jpg b/Exercise 1+2/images/image4.jpg
similarity index 100%
rename from Exercise 1/images/image4.jpg
rename to Exercise 1+2/images/image4.jpg
diff --git a/Exercise 1/images/image5-small.jpg b/Exercise 1+2/images/image5-small.jpg
similarity index 100%
rename from Exercise 1/images/image5-small.jpg
rename to Exercise 1+2/images/image5-small.jpg
diff --git a/Exercise 1/images/image5.jpg b/Exercise 1+2/images/image5.jpg
similarity index 100%
rename from Exercise 1/images/image5.jpg
rename to Exercise 1+2/images/image5.jpg
diff --git a/Exercise 1/images/image6-small.jpg b/Exercise 1+2/images/image6-small.jpg
similarity index 100%
rename from Exercise 1/images/image6-small.jpg
rename to Exercise 1+2/images/image6-small.jpg
diff --git a/Exercise 1/images/image6.jpg b/Exercise 1+2/images/image6.jpg
similarity index 100%
rename from Exercise 1/images/image6.jpg
rename to Exercise 1+2/images/image6.jpg
diff --git a/Exercise 1/images/image7-small.jpg b/Exercise 1+2/images/image7-small.jpg
similarity index 100%
rename from Exercise 1/images/image7-small.jpg
rename to Exercise 1+2/images/image7-small.jpg
diff --git a/Exercise 1/images/image7.jpg b/Exercise 1+2/images/image7.jpg
similarity index 100%
rename from Exercise 1/images/image7.jpg
rename to Exercise 1+2/images/image7.jpg
diff --git a/Exercise 1/images/image8-small.jpg b/Exercise 1+2/images/image8-small.jpg
similarity index 100%
rename from Exercise 1/images/image8-small.jpg
rename to Exercise 1+2/images/image8-small.jpg
diff --git a/Exercise 1/images/image8.jpg b/Exercise 1+2/images/image8.jpg
similarity index 100%
rename from Exercise 1/images/image8.jpg
rename to Exercise 1+2/images/image8.jpg
diff --git a/Exercise 1/index.html b/Exercise 1+2/index.html
similarity index 100%
rename from Exercise 1/index.html
rename to Exercise 1+2/index.html
diff --git a/Exercise 1/script.js b/Exercise 1+2/script.js
similarity index 100%
rename from Exercise 1/script.js
rename to Exercise 1+2/script.js
diff --git a/Exercise 1/selectable.html b/Exercise 1+2/selectable.html
similarity index 100%
rename from Exercise 1/selectable.html
rename to Exercise 1+2/selectable.html
diff --git a/Exercise 1/slideshow.html b/Exercise 1+2/slideshow.html
similarity index 100%
rename from Exercise 1/slideshow.html
rename to Exercise 1+2/slideshow.html
diff --git a/Exercise 1/sortable.html b/Exercise 1+2/sortable.html
similarity index 100%
rename from Exercise 1/sortable.html
rename to Exercise 1+2/sortable.html
diff --git a/Exercise 1/style.css b/Exercise 1+2/style.css
similarity index 100%
rename from Exercise 1/style.css
rename to Exercise 1+2/style.css
diff --git a/Exercise 1/tabs.html b/Exercise 1+2/tabs.html
similarity index 100%
rename from Exercise 1/tabs.html
rename to Exercise 1+2/tabs.html
diff --git a/Exercise 3/index.html b/Exercise 3/index.html
index 1a18e187d60cf544ce84191df046eebcc663cfd1..b8030f7e63f22f5a6015c1f825107be32c0b5d90 100644
--- a/Exercise 3/index.html
+++ b/Exercise 3/index.html
@@ -23,16 +23,22 @@
<div id = "container">
<div id = "droppable-div">
- <div class="droppable ui-widget-header">
- <img class="myImage"/>
+ <div class="droppable ui-widget-header inactiveLink">
+ <a href="" src="" data-fancybox class="fancyboxLink">
+ <img class="myImage" src="" />
+ </a>
</div>
- <div class="droppable ui-widget-header">
- <img class="myImage"/>
+ <div class="droppable ui-widget-header inactiveLink">
+ <a href="" src="" data-fancybox class="fancyboxLink">
+ <img class="myImage" src="" />
+ </a>
</div>
- <div class="droppable ui-widget-header">
- <img class="myImage" />
+ <div class="droppable ui-widget-header inactiveLink">
+ <a href="" src="" data-fancybox class="fancyboxLink">
+ <img class="myImage" src="" />
+ </a>
</div>
<button> Reset </button>
</div>
diff --git a/Exercise 3/script.js b/Exercise 3/script.js
index ed64f1ed82e3da577ebc6d9c642147b3f7ce590a..2c17ebbefd19864d4514e521ec87d7814011e933 100644
--- a/Exercise 3/script.js
+++ b/Exercise 3/script.js
@@ -1,8 +1,14 @@
+let usedSrc = [];
+
$( document ).ready(function() {
$( function() {
$("button").click(function() {
- $(".droppable img").removeAttr("src");
+ $(".droppable img").removeAttr("src");
+ $(".droppable img").removeAttr("href");
+ $(".droppable a").attr("href", '');
+ $(".droppable").addClass("inactiveLink");
+ usedSrc = [];
});
$("#myTable").tablesorter();
@@ -15,13 +21,23 @@ $( function() {
$(".droppable").droppable({
drop: function(event, ui) {
- $( this )
- .find( "img" )
- $('img', this).attr("src", ui.draggable.attr("src"));
+ $(this)
+ .find( 'img', '.fancyboxLink' )
+
+ let index = usedSrc.indexOf($('img',this).attr("src"));
+ if (index != -1) {
+ usedSrc.splice(index, 1);''
+ }
- $('img', this).attr("data-fancybox", "gallery");
- }
+ if (usedSrc.indexOf(ui.draggable.attr("src")) === -1) {
+ $('img', this).attr("src", ui.draggable.attr("src"));
+ $(".fancyboxLink", this).attr("href", ui.draggable.attr("src"));
+ usedSrc.push(ui.draggable.attr("src"));
+ $(this).removeClass("inactiveLink");
+ }
+
+ }
});
diff --git a/Exercise 3/style.css b/Exercise 3/style.css
index 0e22f1477d58f85846b461b4c183bfd72d2d0e51..c4fba4caeba271c22a2e1e5763a24aa4dbdaec22 100644
--- a/Exercise 3/style.css
+++ b/Exercise 3/style.css
@@ -7,27 +7,27 @@ flex-direction: column;
}
.draggable {
- width: 100px;
- height: 100px;
+ width: 70px;
+ height: 70px;
padding: 0.1em;
- float: left;
- margin: 20px 10px 10px 40px;
+ float: left;
+ margin-left: 3px;
}
.droppable {
- width: 150px;
- height: 150px;
+ width: 130px;
+ height: 130px;
padding: 0.1em;
float: left;
margin: 10px; }
#droppable-div {
- margin-bottom: 50px;
+ margin-bottom: 40px;
}
.ui-widget-content img {
- width: 100px;
- height: 100px;
+ width: 70px;
+ height: 70px;
}
.table-container {
@@ -38,9 +38,7 @@ height: 500px;
#myTable {
font-family: arial, sans-serif;
border-collapse: collapse;
- width: 100%;
- height: 50%;
-
+ width: 95%;
}
#myTable td, th {
@@ -53,6 +51,15 @@ height: 500px;
}
.myImage {
- width: 100%;
- height: 100%;
- }
\ No newline at end of file
+ width: 100%;
+ height: 100%;
+ }
+
+ .inactiveLink {
+ pointer-events: none;
+ cursor: default;
+ }
+
+ .droppable a[href='']{
+ display:none;
+}
\ No newline at end of file