Merge branch 'development'

views/otherPages/login.ejs

@@ -31,13 +31,7 @@
                 <input type="password" name="password" required>
             </label>
     
-            <input id="signIn" type="submit" value="Sign In with Email">
-    
-            <h1>OR</h1>
-    
-            <!-- <a class="button buttonWithBorder" href="/cloverlogin">Sign In with Clover</a> -->
-    
-            <a class="button buttonWithBorder" href="/squarelogin">Sign In with Square</a>
+            <input id="signIn" type="submit" value="Sign In">        
             
             <a href="/reset/email" class="link">Forgot your password?</a>