merging

diff --cc src/App.vue
index ce8fa5bdbe70abc6ba891fbf4bad3bee7e027166,99fa548eb457be68ec7da0801ea1ca0ed992e8cd..be19d8ecc64dbda6ce6864cea3dc7582f5d39c63
--- 1/src/App.vue
--- 2/src/App.vue
+++ b/src/App.vue
@@@ -1,7 -1,7 +1,7 @@@
  <template>
 -  <div id="app" v-if="ready">
 +  <div id="app" v-if="(windowReady && sessionReady)">
  
-     <button class="titlebar" />
+     <button id="titlebar" />
  
      <!-- Minimize and exit buttons. -->
      <span class="menu">

diff --cc src/components/input.vue
Simple merge

diff --cc windowState.json
index 26c34cbb89f4cdff551eb71ddc99c11db030d81c,29b9ce17e1949dedd1eeaff33e3b2a3de96ef030..4394ee18dca3782c33e10e51e9ea9330fcdccbf7
--- 1/windowState.json
--- 2/windowState.json
+++ b/windowState.json
@@@ -1,1 -1,1 +1,5 @@@
- {"w":629,"h":500,"x":1423,"y":657}
 -{"w":622,"h":616,"x":1163,"y":499}
++<<<<<<< HEAD
++{"w":629,"h":500,"x":1423,"y":657}
++=======
++{"w":622,"h":616,"x":1163,"y":499}
++>>>>>>> logout