fixed confilicts

diff --cc index.html
index 055dbba,c1d2914..03ef630
--- 1/index.html
--- 2/index.html
+++ b/index.html
@@@ -10,16 -10,8 +10,20 @@@
                z-index: 999;
                overflow: hidden;
      background:-webkit-radial-gradient(center, ellipse cover,
++<<<<<<< HEAD
 +      #9e9e9e 0%, #757575  100%);
 +    /* top: 0; */
 +    /* transition: top 700ms cubic-bezier(0.895, 0.03, 0.685, 0.22), */
 +    /* opacity: 1;
 +    transition: opacity 1000ms cubic-bezier(0.895, 0.03, 0.685, 0.22); */
++=======
+     #9e9e9e 0%, #757575  100%);
++>>>>>>> c1d727d6c4753e967cdd3e9df93db3bf993eb389
        }
 +
 +  #splashscreen * {
 +    overflow: hidden;
 +  }
        .clock {
                display: none;
        }

diff --cc js/splashscreen.js
index 969ade6,f8420dd..f5da864
--- 1/js/splashscreen.js
--- 2/js/splashscreen.js
+++ b/js/splashscreen.js
@@@ -145,18 -143,15 +145,25 @@@ class SplashScreen 
                }
  
                this.state = "moving";
++<<<<<<< HEAD
 +              // this.$el.css("top", "0");
 +              // this.$el.css("opacity", "1");
 +
 +              this.$el.fadeIn(MOVE_DUR, () => {
 +                      // this.$el.remove("filter");
++=======
+               this.$el.animate({
+                       top: "0",
+                       filter: "blur(20px)"
+               }, time, "easeOutQuint", () => {
++>>>>>>> c1d727d6c4753e967cdd3e9df93db3bf993eb389
                        this.state = "closed";
 -                      clearTimeout(this.resetTimeout);
 +                      this.$content.fadeIn("slow")
 +                      // this.$el.show();
                });
 +
        }
 -      open(time=400) {
 +      open(time=300) {
                if (this.state == "open" || this.state == "moving") {
                        log.warn("Cannot open splash screen when state is: " + this.state);
                        return;
@@@ -169,44 -164,14 +176,54 @@@
                        return;
                }
                this.state = "moving";
++<<<<<<< HEAD
 +
 +                              this.$content.fadeOut("fast", () => {
 +                                      // this.$el.remove("filter");
 +                                      this.$el.fadeOut(MOVE_DUR, () => {
 +                                              this.state = "open";
 +                                      });
 +
 +                                      // this.$el.show();
 +                              });
 +              // this.$el.css("top", "-100%");
 +              // this.$el.css("opacity", "0");
 +              //
 +              //
 +              // setTimeout(() => {
 +              //      this.state = "open";
 +              //      this.$el.hide();
 +              // }, CSS_MOVE_DUR);
 +
 +
 +      }
 +
 + _moveUp($el, cb) {
 +            $el.addClass("move-up");
 +            setTimeout(() => {
 +              $el.css("top", "-100%").removeClass("move-up");
 +                                      if (typeof cb == "function") cb($el);
 +            }, CSS_MOVE_DUR);
++=======
+               this.$el.animate({
+                       top: "-100%"
+               }, time, "easeInCirc", () => {
+                       this.state = "open";
+                       // close the screen after 1 minute of inactivty
+                       this.resetTimeout = setTimeout(() => this.reset, reset_duration);
+               });
++>>>>>>> c1d727d6c4753e967cdd3e9df93db3bf993eb389
 +      }
 +      _moveDown($el, cb) {
 +              $el.addClass("move-down");
 +              setTimeout(() => {
 +                      $el.css("top", "0").removeClass("move-down");
 +                      if (typeof cb == "function") cb($el);
 +              }, CSS_MOVE_DUR);
        }
 +      /**
 +       * Closes the splash screen if there has been no user activity
 +       */
        reset() {
                if (this.state == "open") {
                        this.close();