redirct for website

src/welcomePage.js

@@ -1,7 +1,21 @@
+<<<<<<< Updated upstream
 import PersistentSyncStorage from './helpers/PersistentSyncStorage';
 
 const setupComplete = () => {
 
+=======
+import './stylus/setupPage.styl';
+import PersistentSyncStorage from './helpers/PersistentSyncStorage';
+
+// --- Definitions ---
+const completeButton = document.querySelector('.complete-setup-button');
+const successOverlay = document.querySelector('.success-overlay');
+const successIcon = successOverlay.querySelector('.material-icons');
+const successCloseMessageCountdown = successOverlay.querySelector('.countdown');
+
+const setupComplete = () => {
+  // do nuffin
+>>>>>>> Stashed changes
 };
 
 // --- Main ---
@@ -21,6 +35,10 @@ const main = () => {
 
     console.log('Competed setup, sent message');
   });
+<<<<<<< Updated upstream
+=======
+  
+>>>>>>> Stashed changes
 };
 
 // --- Executed ---