From 5e7d84439daed98ad5c256f4e02cd3f97d2a9c97 Mon Sep 17 00:00:00 2001
From: Andrew Hutton <fromalaska49@gmail.com>
Date: Wed, 8 Aug 2018 00:09:55 -0500
Subject: [PATCH] Coding Standards
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Standardized tabs/spaces…for better or worse, now using only spaces
---
 common/footer.php           |  130 ++--
 common/google-analytics.php |    6 +-
 common/head-includes.php    |   28 +-
 common/menu.php             |  102 +--
 contact.php                 |  458 +++++++-------
 css/index.css               |   94 +--
 css/master.css              |  548 ++++++++--------
 dues.php                    |  166 ++---
 groups.php                  |  294 ++++-----
 index.php                   |  132 ++--
 join.php                    |   90 +--
 laptops.php                 |  120 ++--
 officers.php                | 1180 +++++++++++++++++------------------
 process_dues.php            |   98 +--
 resources.php               |   48 +-
 send_message.php            |  354 +++++------
 shell/index.php             | 1164 +++++++++++++++++-----------------
 tools/asap.py               |  194 +++---
 tools/pypros.py             |  398 ++++++------
 19 files changed, 2802 insertions(+), 2802 deletions(-)

diff --git a/common/footer.php b/common/footer.php
index 827f0f7..06cb835 100644
--- a/common/footer.php
+++ b/common/footer.php
@@ -1,67 +1,67 @@
 <footer>
-	<div id="footer" class="container">
-		<div class="row">
-			<div class="col-sm-6" id="copyright-container">
-				Copyright &copy; <?php echo(date('Y')); ?> ACM UTSA
-			</div>
-			<div class="col-sm-6" id="social-media-container">
-				<div class="row" style="">
-					<div class="hidden-xs col-sm-12">
-						<a href="mailto:acm.utsa@gmail.com" class="footer-social">
-							<div class="fa fa-envelope-square fa-3x">
-							</div>
-						</a>
-						<a href="http://acm-utsa.slack.com" class="footer-social">
-							<div class="fa fa-slack fa-3x">
-							</div>
-						</a>
-						<a href="http://github.com/UTSA-ACM" class="footer-social">
-							<div class="fa fa-github fa-3x">
-							</div>
-						</a>
-						<a href="http://www.facebook.com/ACM-UTSA-424006151132274/?fref=ts" class="footer-social">
-							<div class="fa fa-facebook-square fa-3x">
-							</div>
-						</a>
-						<a href="http://twitter.com/acm_utsa" class="footer-social">
-							<div class="fa fa-twitter-square fa-3x">
-							</div>
-						</a>
-						<a href="http://www.linkedin.com/groups/8413611" class="footer-social">
-							<div class="fa fa-linkedin-square fa-3x">
-							</div>
-						</a>
-					</div>
-					<div class="col-xs-12 hidden-sm hidden-md hidden-lg hidden-xl">
-						<a href="mailto:acm.utsa@gmail.com" class="footer-social">
-							<div class="fa fa-envelope-square fa-3x">
-							</div>
-						</a>
-						<a href="http://acm-utsa.slack.com" class="footer-social">
-							<div class="fa fa-slack fa-3x">
-							</div>
-						</a>
-						<a href="http://github.com/UTSA-ACM" class="footer-social">
-							<div class="fa fa-github fa-3x">
-							</div>
-						</a>
-					</div>
-					<div class="col-xs-12 hidden-sm hidden-md hidden-lg hidden-xl">
-						<a href="http://www.facebook.com/ACM-UTSA-424006151132274/?fref=ts" class="footer-social">
-							<div class="fa fa-facebook-square fa-3x">
-							</div>
-						</a>
-						<a href="http://twitter.com/acm_utsa" class="footer-social">
-							<div class="fa fa-twitter-square fa-3x">
-							</div>
-						</a>
-						<a href="http://www.linkedin.com/groups/8413611" class="footer-social">
-							<div class="fa fa-linkedin-square fa-3x">
-							</div>
-						</a>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
+    <div id="footer" class="container">
+        <div class="row">
+            <div class="col-sm-6" id="copyright-container">
+                Copyright &copy; <?php echo(date('Y')); ?> ACM UTSA
+            </div>
+            <div class="col-sm-6" id="social-media-container">
+                <div class="row" style="">
+                    <div class="hidden-xs col-sm-12">
+                        <a href="mailto:acm.utsa@gmail.com" class="footer-social">
+                            <div class="fa fa-envelope-square fa-3x">
+                            </div>
+                        </a>
+                        <a href="http://acm-utsa.slack.com" class="footer-social">
+                            <div class="fa fa-slack fa-3x">
+                            </div>
+                        </a>
+                        <a href="http://github.com/UTSA-ACM" class="footer-social">
+                            <div class="fa fa-github fa-3x">
+                            </div>
+                        </a>
+                        <a href="http://www.facebook.com/ACM-UTSA-424006151132274/?fref=ts" class="footer-social">
+                            <div class="fa fa-facebook-square fa-3x">
+                            </div>
+                        </a>
+                        <a href="http://twitter.com/acm_utsa" class="footer-social">
+                            <div class="fa fa-twitter-square fa-3x">
+                            </div>
+                        </a>
+                        <a href="http://www.linkedin.com/groups/8413611" class="footer-social">
+                            <div class="fa fa-linkedin-square fa-3x">
+                            </div>
+                        </a>
+                    </div>
+                    <div class="col-xs-12 hidden-sm hidden-md hidden-lg hidden-xl">
+                        <a href="mailto:acm.utsa@gmail.com" class="footer-social">
+                            <div class="fa fa-envelope-square fa-3x">
+                            </div>
+                        </a>
+                        <a href="http://acm-utsa.slack.com" class="footer-social">
+                            <div class="fa fa-slack fa-3x">
+                            </div>
+                        </a>
+                        <a href="http://github.com/UTSA-ACM" class="footer-social">
+                            <div class="fa fa-github fa-3x">
+                            </div>
+                        </a>
+                    </div>
+                    <div class="col-xs-12 hidden-sm hidden-md hidden-lg hidden-xl">
+                        <a href="http://www.facebook.com/ACM-UTSA-424006151132274/?fref=ts" class="footer-social">
+                            <div class="fa fa-facebook-square fa-3x">
+                            </div>
+                        </a>
+                        <a href="http://twitter.com/acm_utsa" class="footer-social">
+                            <div class="fa fa-twitter-square fa-3x">
+                            </div>
+                        </a>
+                        <a href="http://www.linkedin.com/groups/8413611" class="footer-social">
+                            <div class="fa fa-linkedin-square fa-3x">
+                            </div>
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
 </footer>
diff --git a/common/google-analytics.php b/common/google-analytics.php
index ada91a2..0f8472f 100644
--- a/common/google-analytics.php
+++ b/common/google-analytics.php
@@ -1,6 +1,6 @@
 <script type="text/javascript">
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
 
-	ga('create', 'UA-71408623-1', 'auto');
-	ga('send', 'pageview');
+    ga('create', 'UA-71408623-1', 'auto');
+    ga('send', 'pageview');
 </script>
\ No newline at end of file
diff --git a/common/head-includes.php b/common/head-includes.php
index 2f1a09f..4a5e9ca 100644
--- a/common/head-includes.php
+++ b/common/head-includes.php
@@ -9,20 +9,20 @@
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
 <script type="text/javascript" src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
-		$("#shell-link").on("mouseenter", function(){
-			$("#shell-link").css("background-color", "#296097");
-		});
-		$("#shell-link").on("click", function(e){
-			e.preventDefault();
-			var new_window = window.open("shell", "_blank", "menubar=1,resizable=0,width=570,height=320");
-			$("#shell-link").css("background-color", $("#main-menu-container").css("background-color"));
-		});
-		$("#shell-link").on("mouseleave", function(e){
-			$("#shell-link").css("background-color", $("#main-menu-container").css("background-color"));
-		});
-	});
+    $(document).ready(function(){
+        $("#shell-link").on("mouseenter", function(){
+            $("#shell-link").css("background-color", "#296097");
+        });
+        $("#shell-link").on("click", function(e){
+            e.preventDefault();
+            var new_window = window.open("shell", "_blank", "menubar=1,resizable=0,width=570,height=320");
+            $("#shell-link").css("background-color", $("#main-menu-container").css("background-color"));
+        });
+        $("#shell-link").on("mouseleave", function(e){
+            $("#shell-link").css("background-color", $("#main-menu-container").css("background-color"));
+        });
+    });
 </script>
 <?php
-	include('common/google-analytics.php');
+    include('common/google-analytics.php');
 ?>
\ No newline at end of file
diff --git a/common/menu.php b/common/menu.php
index c79fd82..7dd6ba2 100644
--- a/common/menu.php
+++ b/common/menu.php
@@ -1,58 +1,58 @@
 <div id="menu-container">
-	<div id="main-menu-container">
-		<nav class="navbar">
-			<div class="container">
-				<div class="navbar-header">
-					<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#nav-collapse" aria-expanded="false">
-						<span class="sr-only">Toggle navigation</span>
-						<span class="icon-bar"></span>
-						<span class="icon-bar"></span>
-						<span class="icon-bar"></span>
-					</button>
-					<a class="navbar-brand" href=".">
-						<img id="logo" src="images/logo-bordered.png" alt="The Assocation for Computing Machinery - UTSA Chapter">
-					</a>
-					<h1>
-						Association for
-						<br />
-						Computing
-						<br />
-						Machinery
-					</h1>
-				</div> <!-- .navbar-header -->
-				<div class="collapse navbar-collapse" id="nav-collapse">
-					<ul class="nav navbar-nav navbar-right">
-						<li><a href=".">Home</a></li>
-						<li><a href="about">About</a></li>
-						<li><a href="groups">Groups</a></li>
-						<!-- <li><a href="resources">Resources</a></li> -->
-						<li><a href="shell" id="shell-link">Shell</a></li>
-						<li><a href="officers">Officers</a></li>
-						<li><a href="contact">Contact Us</a></li>
-						<!-- collapse-only menu items -->
-						<li class="main-sub-menu-item">
-							<a href="join">Join ACM</a>
-						</li>
-						<li class="main-sub-menu-item">
-							<a href="dues">Pay Dues</a>
-						</li>
-						<li class="main-sub-menu-item">
-							<a href="calendar">Calendar</a>
-						</li>
-						<li class="main-sub-menu-item">
-							<a href="http://rowdyhacks.com">RowdyHacks</a>
-						</li>
-					</ul>
-				</div><!-- .navbar-collapse -->
-			</div> <!-- .container -->
-		</nav>
-	</div> <!-- #main-menu-container -->
-	<div id="sub-menu-container" class="container">
-    	<div id="sub-menu" class="pull-right">
+    <div id="main-menu-container">
+        <nav class="navbar">
+            <div class="container">
+                <div class="navbar-header">
+                    <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#nav-collapse" aria-expanded="false">
+                        <span class="sr-only">Toggle navigation</span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                    </button>
+                    <a class="navbar-brand" href=".">
+                        <img id="logo" src="images/logo-bordered.png" alt="The Assocation for Computing Machinery - UTSA Chapter">
+                    </a>
+                    <h1>
+                        Association for
+                        <br />
+                        Computing
+                        <br />
+                        Machinery
+                    </h1>
+                </div> <!-- .navbar-header -->
+                <div class="collapse navbar-collapse" id="nav-collapse">
+                    <ul class="nav navbar-nav navbar-right">
+                        <li><a href=".">Home</a></li>
+                        <li><a href="about">About</a></li>
+                        <li><a href="groups">Groups</a></li>
+                        <!-- <li><a href="resources">Resources</a></li> -->
+                        <li><a href="shell" id="shell-link">Shell</a></li>
+                        <li><a href="officers">Officers</a></li>
+                        <li><a href="contact">Contact Us</a></li>
+                        <!-- collapse-only menu items -->
+                        <li class="main-sub-menu-item">
+                            <a href="join">Join ACM</a>
+                        </li>
+                        <li class="main-sub-menu-item">
+                            <a href="dues">Pay Dues</a>
+                        </li>
+                        <li class="main-sub-menu-item">
+                            <a href="calendar">Calendar</a>
+                        </li>
+                        <li class="main-sub-menu-item">
+                            <a href="http://rowdyhacks.com">RowdyHacks</a>
+                        </li>
+                    </ul>
+                </div><!-- .navbar-collapse -->
+            </div> <!-- .container -->
+        </nav>
+    </div> <!-- #main-menu-container -->
+    <div id="sub-menu-container" class="container">
+        <div id="sub-menu" class="pull-right">
             <a href="join" id="sub-menu-item-1" class="sub-menu-item">Join ACM</a>
             <a href="dues" id="sub-menu-item-2" class="sub-menu-item">Pay Dues</a>
             <a href="calendar" id="sub-menu-item-3" class="sub-menu-item">Calendar</a>
             <a href="http://rowdyhacks.com" id="sub-menu-item-4" class="sub-menu-item">RowdyHacks</a>
-		</div>
+        </div>
     </div>
 </div> <!-- #menu-container -->
diff --git a/contact.php b/contact.php
index 301dfb6..feaad28 100644
--- a/contact.php
+++ b/contact.php
@@ -1,232 +1,232 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<?php
-			require('common/head-includes.php');
-		?>
-		<title>Contact Us | Association for Computing Machinery UTSA</title>
-		<style type="text/css">
-			select, input[type="text"], input[type="password"], textarea {
-				background-color: #DFDFDF;
-				border-radius: 3px;
-				border-style: none;
-				outline-color: #204972;
-				outline-width: 1px;
-				outline-style: none;
-				padding-left: 10px;
-				padding-right: 10px;
-			}
-			select:focus, input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
-				outline-style: none;
-				box-shadow: 0px 0px 0px 3px #204972;
-			}
-			/*
-			select::selection, input[type="text"]::selection, input[type="password"]::selection, textarea::selection {
-				background:#204972;
-				color: #FFFFFF;
-			}
-			*/
-		</style>
-		<script type="text/javascript">
-			$(document).ready(function(){
-				<?php
-					if(isset($_GET['message_stat'])){
-						echo('$("#stat-modal").modal("show");');
-					}
-				?>
-			});
-		</script>
-	</head>
-	<body>
-		<?php
-			require('common/menu.php');
-			$message_stat = '';
-			$message_stat_title = '';
-			if(isset($_GET['message_stat'])){
-				if($_GET['message_stat'] == 1){
-					$message_stat_title = 'Thanks';
-					$message_stat = 'Your message has successfully been sent';
-				}
-				else if($_GET['message_stat'] == 2){
-					$message_stat_title = 'Error';
-					$message_stat = 'Error: message failed to send';
-				}
-				else{
-					$message_stat_title = 'Error';
-					$message_stat = 'Message Status: unknown';
-				}
-			}
-		?>
-		<div class="modal fade" id="stat-modal" role="dialog">
-			<div class="modal-dialog">
-				<div class="modal-content">
-					<div class="modal-header">
-						<div type="button" class="close" data-dismiss="modal">&times;</div>
-						<h4 class="modal-title">
-							<?php
-								echo(htmlentities($message_stat_title));
-							?>
-						</h4>
-					</div>
-					<div class="modal-body">
-						<p>
-							<?php
-								echo(htmlentities($message_stat));
-							?>
-						</p>
-					</div>
-					<!--
-					<div class="modal-footer">
-						<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-					<div>
-					-->
-				</div>
-			</div>
-		</div>
-		<div id="content" class="container">
-			<div class="row">
-				<div class="col-sm-12">
-					<div class="row section-container group">
-						<div class="col-sm-12">
-							<h1>Contact Us</h1>
-							<br />
-							<div class="row">
-								<div class="col-sm-8">
-									<p>
-										ACM's primary form of communication is through <a href="index#slack-container">Slack</a> at <a href="http://acm-utsa.slack.com">acm-utsa.slack.com</a> but you can contact us directly through the form below.
-									</p>
-								</div>
-								<div class="col-sm-4" style="text-align:center;">
-									<a class="link" href="slack_invite.php" target="_blank">
-										<input type="button" style="outline-style: none;" value="Request Slack Invite" />
-									</a>
-								</div>
-							</div>
-							<br />
-							<form action="send_message" method="post">
-								<?php
-									$position = '';
-									if(isset($_GET['position'])){
-										$position = $_GET['position'];
-									}
-								?>
-								<div class="row">
-									<div class="hidden-xs col-sm-12" style="text-align:left;margin-bottom:10px;">
-										<input type="text" name="name" placeholder="Your Name" aria-required="true" style="margin-right: 10px; width: 260px;" />
-										<input type="text" name="email" placeholder="Your Email" aria-required="true" style="width: 260px;" />
-									</div>
-									<div class="col-xs-12 hidden-sm hidden-md hidden-lg hidden-xl" style="text-align:center;margin-top:10px;">
-										<input type="text" name="m-name" placeholder="Your Name" aria-required="true" style="width:100%;" />
-									</div>
-									<div class="col-xs-12 hidden-sm hidden-md hidden-lg hidden-xl" style="text-align:center;margin-top:10px;margin-bottom:10px;">
-										<input type="text" name="m-email" placeholder="Your Email" aria-required="true" style="width:100%;" />
-									</div>
-								</div>
-								<div class="row">
-									<div class="col-md-12">
-										<textarea name="text" placeholder="Your Message" style="width:100%;height:400px;"></textarea>
-									</div>
-								</div>
-								<div class="row">
-									<div class="col-sm-12 hidden-xs" style="text-align:right;">
-										<input type="submit" value="Send" id="contact-form-submit-button" /> to
-										<select name="recipient" style="margin-left:10px;">
-											<option value="acm">
-												ACM UTSA
-											</option>
-											<option value="president"<?php if($position == 'president') echo(' selected');?>>
-												President
-											</option>
-											<option value="vice-president"<?php if($position == 'vice-president') echo(' selected');?>>
-												Vice President
-											</option>
-											<option value="secretary"<?php if($position == 'secretary') echo(' selected');?>>
-												Secretary
-											</option>
-											<option value="treasurer"<?php if($position == 'treasurer') echo(' selected');?>>
-												Treasurer
-											</option>
-											<!--
-											<option value="acmw-chair"<?php if($position == 'acmw-chair') echo(' selected');?>>
-												ACMW Chair
-											</option>
-											-->
-											<option value="rowdyhacks-chair"<?php if($position == 'rowdyhacks-chair') echo(' selected');?>>
-												RowdyHacks Chair
-											</option>
-											<option value="pr"<?php if($position == 'pr') echo(' selected');?>>
-												Public Relations
-											</option>
-											<option value="social"<?php if($position == 'social') echo(' selected');?>>
-												Social Events
-											</option>
-											<option value="media"<?php if($position == 'media') echo(' selected');?>>
-												Media
-											</option>
-											<option value="projects"<?php if($position == 'projects') echo(' selected');?>>
-												Projects
-											</option>
-											<option value="membership"<?php if($position == 'membership') echo(' selected');?>>
-												Membership
-											</option>
-										</select>
-									</div>
-									<div class="col-xs-12 hidden-sm hidden-md hidden-lg hidden-xl" style="text-align:center;">
-										<input type="submit" value="Send" id="contact-form-submit-button" />
-										<br />
-										to
-									</div>
-									<div class="col-xs-12 hidden-sm hidden-md hidden-lg hidden-xl" style="text-align:center;margin-top:10px;">
-										<select name="recipient">
-											<option value="acm">
-												ACM UTSA
-											</option>
-											<option value="president"<?php if($position == 'president') echo(' selected');?>>
-												President
-											</option>
-											<option value="vice-president"<?php if($position == 'vice-president') echo(' selected');?>>
-												Vice President
-											</option>
-											<option value="secretary"<?php if($position == 'secretary') echo(' selected');?>>
-												Secretary
-											</option>
-											<option value="treasurer"<?php if($position == 'treasurer') echo(' selected');?>>
-												Treasurer
-											</option>
-											<!--
-											<option value="acmw-chair"<?php if($position == 'acmw-chair') echo(' selected');?>>
-												ACMW Chair
-											</option>
-											-->
-											<option value="rowdyhacks-chair"<?php if($position == 'rowdyhacks-chair') echo(' selected');?>>
-												RowdyHacks Chair
-											</option>
-											<option value="pr"<?php if($position == 'pr') echo(' selected');?>>
-												Public Relations
-											</option>
-											<option value="social"<?php if($position == 'social') echo(' selected');?>>
-												Social Events
-											</option>
-											<option value="media"<?php if($position == 'media') echo(' selected');?>>
-												Media
-											</option>
-											<option value="projects"<?php if($position == 'projects') echo(' selected');?>>
-												Projects
-											</option>
-											<option value="membership"<?php if($position == 'membership') echo(' selected');?>>
-												Membership
-											</option>
-										</select>
-									</div>
-								</div>
-							<form>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-		<?php
-			require('common/footer.php');
-		?>
-	</body>
+    <head>
+        <?php
+            require('common/head-includes.php');
+        ?>
+        <title>Contact Us | Association for Computing Machinery UTSA</title>
+        <style type="text/css">
+            select, input[type="text"], input[type="password"], textarea {
+                background-color: #DFDFDF;
+                border-radius: 3px;
+                border-style: none;
+                outline-color: #204972;
+                outline-width: 1px;
+                outline-style: none;
+                padding-left: 10px;
+                padding-right: 10px;
+            }
+            select:focus, input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
+                outline-style: none;
+                box-shadow: 0px 0px 0px 3px #204972;
+            }
+            /*
+            select::selection, input[type="text"]::selection, input[type="password"]::selection, textarea::selection {
+                background:#204972;
+                color: #FFFFFF;
+            }
+            */
+        </style>
+        <script type="text/javascript">
+            $(document).ready(function(){
+                <?php
+                    if(isset($_GET['message_stat'])){
+                        echo('$("#stat-modal").modal("show");');
+                    }
+                ?>
+            });
+        </script>
+    </head>
+    <body>
+        <?php
+            require('common/menu.php');
+            $message_stat = '';
+            $message_stat_title = '';
+            if(isset($_GET['message_stat'])){
+                if($_GET['message_stat'] == 1){
+                    $message_stat_title = 'Thanks';
+                    $message_stat = 'Your message has successfully been sent';
+                }
+                else if($_GET['message_stat'] == 2){
+                    $message_stat_title = 'Error';
+                    $message_stat = 'Error: message failed to send';
+                }
+                else{
+                    $message_stat_title = 'Error';
+                    $message_stat = 'Message Status: unknown';
+                }
+            }
+        ?>
+        <div class="modal fade" id="stat-modal" role="dialog">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <div type="button" class="close" data-dismiss="modal">&times;</div>
+                        <h4 class="modal-title">
+                            <?php
+                                echo(htmlentities($message_stat_title));
+                            ?>
+                        </h4>
+                    </div>
+                    <div class="modal-body">
+                        <p>
+                            <?php
+                                echo(htmlentities($message_stat));
+                            ?>
+                        </p>
+                    </div>
+                    <!--
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                    <div>
+                    -->
+                </div>
+            </div>
+        </div>
+        <div id="content" class="container">
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="row section-container group">
+                        <div class="col-sm-12">
+                            <h1>Contact Us</h1>
+                            <br />
+                            <div class="row">
+                                <div class="col-sm-8">
+                                    <p>
+                                        ACM's primary form of communication is through <a href="index#slack-container">Slack</a> at <a href="http://acm-utsa.slack.com">acm-utsa.slack.com</a> but you can contact us directly through the form below.
+                                    </p>
+                                </div>
+                                <div class="col-sm-4" style="text-align:center;">
+                                    <a class="link" href="slack_invite.php" target="_blank">
+                                        <input type="button" style="outline-style: none;" value="Request Slack Invite" />
+                                    </a>
+                                </div>
+                            </div>
+                            <br />
+                            <form action="send_message" method="post">
+                                <?php
+                                    $position = '';
+                                    if(isset($_GET['position'])){
+                                        $position = $_GET['position'];
+                                    }
+                                ?>
+                                <div class="row">
+                                    <div class="hidden-xs col-sm-12" style="text-align:left;margin-bottom:10px;">
+                                        <input type="text" name="name" placeholder="Your Name" aria-required="true" style="margin-right: 10px; width: 260px;" />
+                                        <input type="text" name="email" placeholder="Your Email" aria-required="true" style="width: 260px;" />
+                                    </div>
+                                    <div class="col-xs-12 hidden-sm hidden-md hidden-lg hidden-xl" style="text-align:center;margin-top:10px;">
+                                        <input type="text" name="m-name" placeholder="Your Name" aria-required="true" style="width:100%;" />
+                                    </div>
+                                    <div class="col-xs-12 hidden-sm hidden-md hidden-lg hidden-xl" style="text-align:center;margin-top:10px;margin-bottom:10px;">
+                                        <input type="text" name="m-email" placeholder="Your Email" aria-required="true" style="width:100%;" />
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="col-md-12">
+                                        <textarea name="text" placeholder="Your Message" style="width:100%;height:400px;"></textarea>
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="col-sm-12 hidden-xs" style="text-align:right;">
+                                        <input type="submit" value="Send" id="contact-form-submit-button" /> to
+                                        <select name="recipient" style="margin-left:10px;">
+                                            <option value="acm">
+                                                ACM UTSA
+                                            </option>
+                                            <option value="president"<?php if($position == 'president') echo(' selected');?>>
+                                                President
+                                            </option>
+                                            <option value="vice-president"<?php if($position == 'vice-president') echo(' selected');?>>
+                                                Vice President
+                                            </option>
+                                            <option value="secretary"<?php if($position == 'secretary') echo(' selected');?>>
+                                                Secretary
+                                            </option>
+                                            <option value="treasurer"<?php if($position == 'treasurer') echo(' selected');?>>
+                                                Treasurer
+                                            </option>
+                                            <!--
+                                            <option value="acmw-chair"<?php if($position == 'acmw-chair') echo(' selected');?>>
+                                                ACMW Chair
+                                            </option>
+                                            -->
+                                            <option value="rowdyhacks-chair"<?php if($position == 'rowdyhacks-chair') echo(' selected');?>>
+                                                RowdyHacks Chair
+                                            </option>
+                                            <option value="pr"<?php if($position == 'pr') echo(' selected');?>>
+                                                Public Relations
+                                            </option>
+                                            <option value="social"<?php if($position == 'social') echo(' selected');?>>
+                                                Social Events
+                                            </option>
+                                            <option value="media"<?php if($position == 'media') echo(' selected');?>>
+                                                Media
+                                            </option>
+                                            <option value="projects"<?php if($position == 'projects') echo(' selected');?>>
+                                                Projects
+                                            </option>
+                                            <option value="membership"<?php if($position == 'membership') echo(' selected');?>>
+                                                Membership
+                                            </option>
+                                        </select>
+                                    </div>
+                                    <div class="col-xs-12 hidden-sm hidden-md hidden-lg hidden-xl" style="text-align:center;">
+                                        <input type="submit" value="Send" id="contact-form-submit-button" />
+                                        <br />
+                                        to
+                                    </div>
+                                    <div class="col-xs-12 hidden-sm hidden-md hidden-lg hidden-xl" style="text-align:center;margin-top:10px;">
+                                        <select name="recipient">
+                                            <option value="acm">
+                                                ACM UTSA
+                                            </option>
+                                            <option value="president"<?php if($position == 'president') echo(' selected');?>>
+                                                President
+                                            </option>
+                                            <option value="vice-president"<?php if($position == 'vice-president') echo(' selected');?>>
+                                                Vice President
+                                            </option>
+                                            <option value="secretary"<?php if($position == 'secretary') echo(' selected');?>>
+                                                Secretary
+                                            </option>
+                                            <option value="treasurer"<?php if($position == 'treasurer') echo(' selected');?>>
+                                                Treasurer
+                                            </option>
+                                            <!--
+                                            <option value="acmw-chair"<?php if($position == 'acmw-chair') echo(' selected');?>>
+                                                ACMW Chair
+                                            </option>
+                                            -->
+                                            <option value="rowdyhacks-chair"<?php if($position == 'rowdyhacks-chair') echo(' selected');?>>
+                                                RowdyHacks Chair
+                                            </option>
+                                            <option value="pr"<?php if($position == 'pr') echo(' selected');?>>
+                                                Public Relations
+                                            </option>
+                                            <option value="social"<?php if($position == 'social') echo(' selected');?>>
+                                                Social Events
+                                            </option>
+                                            <option value="media"<?php if($position == 'media') echo(' selected');?>>
+                                                Media
+                                            </option>
+                                            <option value="projects"<?php if($position == 'projects') echo(' selected');?>>
+                                                Projects
+                                            </option>
+                                            <option value="membership"<?php if($position == 'membership') echo(' selected');?>>
+                                                Membership
+                                            </option>
+                                        </select>
+                                    </div>
+                                </div>
+                            <form>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <?php
+            require('common/footer.php');
+        ?>
+    </body>
 </html>
diff --git a/css/index.css b/css/index.css
index 4413f29..6dbf347 100644
--- a/css/index.css
+++ b/css/index.css
@@ -1,41 +1,41 @@
 * {
-	transition: all .2s ease;
+    transition: all .2s ease;
 }
 
 #main-menu-container {
-	background-color: #204972;
-	color: #fff;
-	height: 130px;
+    background-color: #204972;
+    color: #fff;
+    height: 130px;
 }
 
 .navbar-collapse {
-	background-color: #204972;
+    background-color: #204972;
 }
 
 .navbar, .navbar > div, .navbar-header {
-	height: 130px;
+    height: 130px;
 }
 
 .navbar {
-	margin-bottom: 0;
-	border-style: none;
+    margin-bottom: 0;
+    border-style: none;
 }
 
 .navbar-brand {
-	padding: 0;
-	height: 130px;
+    padding: 0;
+    height: 130px;
 }
 
 #logo {
-	width: 160px;
-	margin: 0;
+    width: 160px;
+    margin: 0;
 }
 
 #menu-container {
-	postion: fixed;
-	top: 0;
-	left: 0;
-	right: 0;
+    postion: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
 }
 
 .nav {
@@ -45,87 +45,87 @@
 }
 
 .nav>li>a {
-	color: #fff;
+    color: #fff;
 }
 
 .nav>li>a:hover {
-	background-color: #296097;
+    background-color: #296097;
 }
 
 .icon-bar {
-	background-color: #fff;
+    background-color: #fff;
 }
 
 #sub-menu-container {
-	padding: 0;
+    padding: 0;
 }
 
 #sub-menu {
-	background-color: #ccc;
-	padding: 0;
-	margin: 0;
+    background-color: #ccc;
+    padding: 0;
+    margin: 0;
 }
 
 .sub-menu-item {
-	margin:0px 0px 0px -4px;
-	padding:20px;
-	display:inline-block;
-	color:white;
-	text-shadow:0px 0px 1px #000;
+    margin:0px 0px 0px -4px;
+    padding:20px;
+    display:inline-block;
+    color:white;
+    text-shadow:0px 0px 1px #000;
 }
 
 .sub-menu-item:hover {
-	color: #fff;
-	text-decoration: none;
+    color: #fff;
+    text-decoration: none;
 }
 
 #sub-menu-item-1 {
-	background-color:#217dba;
+    background-color:#217dba;
 }
 
 #sub-menu-item-1:hover {
-	background-color:#3498db;
+    background-color:#3498db;
 }
 
 #sub-menu-item-2 {
-	background-color:#007184;
+    background-color:#007184;
 }
 
 #sub-menu-item-2:hover {
-	background-color:#009cb8;
+    background-color:#009cb8;
 }
 
 #sub-menu-item-3 {
-	background-color:#2a844a;
+    background-color:#2a844a;
 }
 
 #sub-menu-item-3:hover {
-	background-color:#36ab5f;
+    background-color:#36ab5f;
 }
 
 #sub-menu-item-4 {
-	background-color:#87c115;
+    background-color:#87c115;
 }
 
 #sub-menu-item-4:hover {
-	background-color:#a5e723;
+    background-color:#a5e723;
 }
 
 #content {
-	margin-top: 50px;
-	background-color: #ccc;
-	min-height: 1000px;
+    margin-top: 50px;
+    background-color: #ccc;
+    min-height: 1000px;
 }
 
 @media (min-width: 833px) and (max-width: 992px), (min-width: 1057px) and (max-width: 1200px), (min-width: 1265px) {
-	.navbar-brand {
-		margin-left: -65px !important;
-	}
+    .navbar-brand {
+        margin-left: -65px !important;
+    }
 
 }
 @media (max-width: 767px) {
-	#sub-menu-container {
-		display: none;
-	}
+    #sub-menu-container {
+        display: none;
+    }
 
 }
diff --git a/css/master.css b/css/master.css
index a927c52..b367d14 100644
--- a/css/master.css
+++ b/css/master.css
@@ -1,483 +1,483 @@
 /****************************
-	Global styles
+    Global styles
 ****************************/
 * {
-	-webkit-transition: all .2s ease;
-	-moz-transition: all .2s ease;
-	-o-transition: all .2s ease;
-	transition: all .2s ease;
+    -webkit-transition: all .2s ease;
+    -moz-transition: all .2s ease;
+    -o-transition: all .2s ease;
+    transition: all .2s ease;
 }
 
 body {
-	background-color: #EFEFEF;
+    background-color: #EFEFEF;
 }
 
 /****************************
-	Header & main navbar
+    Header & main navbar
 ****************************/
 #main-menu-container {
-	background-color: #204972;
-	color: #ffffff;
-	height: 130px;
+    background-color: #204972;
+    color: #ffffff;
+    height: 130px;
 }
 
 .navbar-collapse {
-	background-color: #204972;
+    background-color: #204972;
 }
 
 .navbar, .navbar > div, .navbar-header {
-	height: 130px;
+    height: 130px;
 }
 
 .navbar {
-	margin-bottom: 0;
-	border-style: none;
+    margin-bottom: 0;
+    border-style: none;
 }
 
 .navbar-brand {
-	padding: 0;
-	height: 130px;
+    padding: 0;
+    height: 130px;
 }
 
 .navbar-header>h1 {
-	display: inline-block;
-	font-size: 26px;
-	float: left;
+    display: inline-block;
+    font-size: 26px;
+    float: left;
 }
 
 @media (max-width: 833px) {
-	.navbar-header>h1 {
-		display: none;
-	}
+    .navbar-header>h1 {
+        display: none;
+    }
 }
 
 #logo {
-	width:160px;
-	margin: 0;
+    width:160px;
+    margin: 0;
 }
 
 #menu-container {
-	z-index: 1000;
-	position:fixed;
-	top:0px;
-	left:0px;
-	right:0px;
-	-webkit-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	user-select: none;
-	cursor: default;
+    z-index: 1000;
+    position:fixed;
+    top:0px;
+    left:0px;
+    right:0px;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    cursor: default;
 }
 
 .nav>li>a{
-	color:#ffffff;
-	background-color: inherit;
+    color:#ffffff;
+    background-color: inherit;
 }
 
 .nav>li>a:hover, .nav>li>a:active{
-	background-color: #296097;
+    background-color: #296097;
 }
 
 .icon-bar{
-	background-color: #ffffff;
+    background-color: #ffffff;
 }
 
 /* width >= 768px (tablet, laptop, desktop) */
 @media (min-width: 768px) {
-	.navbar-right {
-		position: relative;
-		top: 80px !important;
-		margin-right: -30px;
-	}
-	/* Hide sub-menu entries on the main navbar unless collapsed */
-	.main-sub-menu-item {
-		display: none !important;
-	}
+    .navbar-right {
+        position: relative;
+        top: 80px !important;
+        margin-right: -30px;
+    }
+    /* Hide sub-menu entries on the main navbar unless collapsed */
+    .main-sub-menu-item {
+        display: none !important;
+    }
 }
 
 /* width >= (breakpoint + 65px) (prevents logo from being pushed off the page on tablet, laptop, desktop)  */
 @media (min-width: 833px) and (max-width: 992px), (min-width: 1057px) and (max-width: 1200px), (min-width: 1265px){
-	.navbar-brand{
-		margin-left: -65px !important;
-	}
+    .navbar-brand{
+        margin-left: -65px !important;
+    }
 }
 
 /* width < 768px (mobile) */
 @media (max-width: 767px) {
-	#logo {
-		height: 50px;
-		width: 50px;
-	}
-	.navbar-brand {
-		margin: 0 auto !important;
-	}
-	#main-menu-container, .navbar, .navbar > div, .navbar-header, .navbar-brand {
-		height: 50px !important;
-	}
-
-	#menu-container{
-		position: absolute;
-	}
+    #logo {
+        height: 50px;
+        width: 50px;
+    }
+    .navbar-brand {
+        margin: 0 auto !important;
+    }
+    #main-menu-container, .navbar, .navbar > div, .navbar-header, .navbar-brand {
+        height: 50px !important;
+    }
+
+    #menu-container{
+        position: absolute;
+    }
 }
 
 /****************************
-	Colorful sub-navbar
+    Colorful sub-navbar
 ****************************/
 #sub-menu-container {
-	padding: 0;
+    padding: 0;
 }
 
 @media (max-width: 767px) {
-	#sub-menu-container {
-		display: none;
-	}
+    #sub-menu-container {
+        display: none;
+    }
 }
 
 #sub-menu {
-	background-color:#ccc;
-	padding:0px;
-	margin:0px;
+    background-color:#ccc;
+    padding:0px;
+    margin:0px;
 }
 
 .sub-menu-item {
-	margin:0px 0px 0px -4px;
-	padding:20px;
-	display:inline-block;
-	color:white;
-	text-shadow:0px 0px 1px #000;
+    margin:0px 0px 0px -4px;
+    padding:20px;
+    display:inline-block;
+    color:white;
+    text-shadow:0px 0px 1px #000;
 }
 .sub-menu-item:hover, .sub-menu-item:active {
-	color:#fff;
-	text-decoration:none;
+    color:#fff;
+    text-decoration:none;
 }
 
 #sub-menu-item-1 {
-	background-color:#217dba; /* 10% darker than on hover */
+    background-color:#217dba; /* 10% darker than on hover */
 }
 #sub-menu-item-1:hover, #sub-menu-item-1:active {
-	background-color:#3498db;
+    background-color:#3498db;
 }
 
 #sub-menu-item-2 {
-	background-color:#007184; /* 10% darker than on hover */
+    background-color:#007184; /* 10% darker than on hover */
 }
 #sub-menu-item-2:hover, #sub-menu-item-2:active {
-	background-color:#009cb8;
+    background-color:#009cb8;
 }
 
 #sub-menu-item-3 {
-	background-color:#2a844a; /* 10% darker than on hover */
+    background-color:#2a844a; /* 10% darker than on hover */
 }
 #sub-menu-item-3:hover, #sub-menu-item-3:active {
-	background-color:#36ab5f;
+    background-color:#36ab5f;
 }
 
 #sub-menu-item-4 {
-	background-color:#87c115; /* 10% darker than on hover */
+    background-color:#87c115; /* 10% darker than on hover */
 }
 #sub-menu-item-4:hover, #sub-menu-item-4:active {
-	background-color:#a5e723;
+    background-color:#a5e723;
 }
 
 /****************************
-	Page content
+    Page content
 ****************************/
 #content {
-	margin-top: 130px;
-	padding: 0px;
-	padding-top: 54px;
-	/*padding: 54px 30px 20px 30px; /* min padding-top:54px; */
-	min-height: 500px; /* for demonstration */
-	/* box-shadow: 0px 0px 15px -10px #000; /* for demonstration */
-	font-size: 20px;
+    margin-top: 130px;
+    padding: 0px;
+    padding-top: 54px;
+    /*padding: 54px 30px 20px 30px; /* min padding-top:54px; */
+    min-height: 500px; /* for demonstration */
+    /* box-shadow: 0px 0px 15px -10px #000; /* for demonstration */
+    font-size: 20px;
 }
 /* width < 768px (mobile) */
 @media (max-width: 767px) {
-	#content {
-		margin-top: 50px;
-		padding-top: 10px;
-		overflow: hidden;
-	}
-	#content>div.row>div.col-sm-12>h1 {
-		margin: 15px;
-	}
+    #content {
+        margin-top: 50px;
+        padding-top: 10px;
+        overflow: hidden;
+    }
+    #content>div.row>div.col-sm-12>h1 {
+        margin: 15px;
+    }
 }
 
 .section-container {
-	padding: 40px 30px;
-	margin: 20px 0px 20px 0px;
-	box-shadow: 0px 1px 11px -3px;
-	border-radius: 3px;
-	background-color: #ffffff;
+    padding: 40px 30px;
+    margin: 20px 0px 20px 0px;
+    box-shadow: 0px 1px 11px -3px;
+    border-radius: 3px;
+    background-color: #ffffff;
 }
 
 .partial-section-container {
-	/*padding: 40px 30px;*/
-	margin: 20px -15px 20px -15px;
-	/*box-shadow: 0px 1px 11px -3px;*/
-	/*border-radius: 3px;*/
-	/*background-color: #ffffff;*/
+    /*padding: 40px 30px;*/
+    margin: 20px -15px 20px -15px;
+    /*box-shadow: 0px 1px 11px -3px;*/
+    /*border-radius: 3px;*/
+    /*background-color: #ffffff;*/
 }
 
 .partial-section-container>*[class*="col-"] {
-	display: -webkit-flex;
-	display: flex;
-	-webkit-flex-direction: row;
-	flex-direction: row;
-	-webkit-align-items: stretch;
-	align-items: stretch;
-	-webkit-flex-grow: 1;
-	flex-grow: 1;
-	-webkit-flex-shrink: 1;
-	flex-shrink: 1;
-	-webkit-flex-basis: 100%;
-	flex-basis: 100%;
-	padding: 0px 12px;
+    display: -webkit-flex;
+    display: flex;
+    -webkit-flex-direction: row;
+    flex-direction: row;
+    -webkit-align-items: stretch;
+    align-items: stretch;
+    -webkit-flex-grow: 1;
+    flex-grow: 1;
+    -webkit-flex-shrink: 1;
+    flex-shrink: 1;
+    -webkit-flex-basis: 100%;
+    flex-basis: 100%;
+    padding: 0px 12px;
 }
 
 .partial-section {
-	padding: 30px;
-	margin: 0px;
-	box-shadow: 0px 1px 11px -3px;
-	border-radius: 3px;
-	background-color: #ffffff;
-	width: 100%;
+    padding: 30px;
+    margin: 0px;
+    box-shadow: 0px 1px 11px -3px;
+    border-radius: 3px;
+    background-color: #ffffff;
+    width: 100%;
 }
 
 .partial-section>h3 {
-	margin: 0px;
-	padding: 0px;
+    margin: 0px;
+    padding: 0px;
 }
 
 .partial-section-h-icon {
-	height: 30px;
-	margin: 0px 0px 15px 0px;
+    height: 30px;
+    margin: 0px 0px 15px 0px;
 }
 
 /* Section Titles */
 .section-container>*[class*="col-"]>h1, .section-container>*[class*="col-"]>h2, .section-container>*[class*="col-"]>h3, .section-container>*[class*="col-"]>h4, .section-container>*[class*="col-"]>h5, .section-container>*[class*="col-"]>h6 {
-	/* Indent section titles
-	margin: 0px 0px 20px 20px;
-	*/
+    /* Indent section titles
+    margin: 0px 0px 20px 20px;
+    */
 }
 
 @media (min-width: 768px) {
-	.partial-section-container {
-		display: -webkit-flex;
-		display: flex;
-		-webkit-flex-direction: row;
-		flex-direction: row;
-		-webkit-align-items: stretch;
-		align-items: stretch;
-	}
+    .partial-section-container {
+        display: -webkit-flex;
+        display: flex;
+        -webkit-flex-direction: row;
+        flex-direction: row;
+        -webkit-align-items: stretch;
+        align-items: stretch;
+    }
 }
 
 @media (max-width: 767px) {
-	.partial-section-container {
-		text-align: center;
-	}
-	.partial-section {
-		margin: 0px 0px 20px 0px;
-		border-radius: 0px;
-	}
-	.section-container, .youtube-embed-container{
-		border-radius: 0px;
-	}
+    .partial-section-container {
+        text-align: center;
+    }
+    .partial-section {
+        margin: 0px 0px 20px 0px;
+        border-radius: 0px;
+    }
+    .section-container, .youtube-embed-container{
+        border-radius: 0px;
+    }
 }
 
 .nav > h1 {
-	text-align: center;
-	margin: 0px 0px 20px 0px;
-	padding: 0px;
+    text-align: center;
+    margin: 0px 0px 20px 0px;
+    padding: 0px;
 }
 
 button, input[type=button], input[type=submit], .stripe-button{
-	position: relative;
-	top: 0px; /* necessary for smooth animations */
-	box-shadow: 0px 0px 0px #000000;
-	border-style: none;
-	background-color: #1a4a86;
-	color: #ffffff;
-	padding: 10px;
-	margin: 10px;
-	border-radius: 2px;
+    position: relative;
+    top: 0px; /* necessary for smooth animations */
+    box-shadow: 0px 0px 0px #000000;
+    border-style: none;
+    background-color: #1a4a86;
+    color: #ffffff;
+    padding: 10px;
+    margin: 10px;
+    border-radius: 2px;
 }
 
 button:hover, input[type=button]:hover, input[type=submit]:hover, .stripe-button:hover, button:active, input[type=button]:active, input[type=submit]:active, .stripe-button:active {
-	top: -3px;
-	box-shadow: 0px 3px 10px -3px #000000;
-	background-color: #1a4a86;
-	color: #ffffff;
+    top: -3px;
+    box-shadow: 0px 3px 10px -3px #000000;
+    background-color: #1a4a86;
+    color: #ffffff;
 }
 
 input[type=image].slack-button {
-	position: relative;
-	top: 0px; /* necessary for smooth animations */
-	box-shadow: 0px 0px 0px #000000;
-	border-style: none;
-	width: 143px;
-	border-radius: 5px;
+    position: relative;
+    top: 0px; /* necessary for smooth animations */
+    box-shadow: 0px 0px 0px #000000;
+    border-style: none;
+    width: 143px;
+    border-radius: 5px;
 }
 
 input[type=image].slack-button:hover, input[type=image].slack-button:active {
-	top: -3px;
-	box-shadow: 0px 3px 10px -3px #000000;
+    top: -3px;
+    box-shadow: 0px 3px 10px -3px #000000;
 }
 
 #home-page-rowdyhacks-image {
-	background: url('../images/photos/min/rowdyhacks2016.jpg');
-	background-size: cover;
-	background-position: center;
+    background: url('../images/photos/min/rowdyhacks2016.jpg');
+    background-size: cover;
+    background-position: center;
 }
 
 #home-page-rowdyhacks-image>div.col-sm-12 {
-	height: 300px;
+    height: 300px;
 }
 
 #about-page-tamuhacks-image {
-	background: url('../images/photos/min/tamuhacks2016.jpg');
-	background-size: cover;
-	background-position: 50% 40%;
+    background: url('../images/photos/min/tamuhacks2016.jpg');
+    background-size: cover;
+    background-position: 50% 40%;
 }
 
 #about-page-tamuhacks-image>div.col-sm-12 {
-	height: 300px;
+    height: 300px;
 }
 
 .youtube-embed-container {
-	padding: 0px;
-	margin: 20px 0px 20px 0px;
-	box-shadow: 0px 1px 11px -3px;
-	border-radius: 3px;
+    padding: 0px;
+    margin: 20px 0px 20px 0px;
+    box-shadow: 0px 1px 11px -3px;
+    border-radius: 3px;
 }
 
 .youtube-embed-container>div {
-	padding: 0px;
-	margin: 0px;
-	border-radius: inherit;
+    padding: 0px;
+    margin: 0px;
+    border-radius: inherit;
 }
 
 @media (max-width: 767px){
-	.youtube-embed-container {
-		text-align: center;
-		box-shadow: 0px 0px 0px 0px #000;
-	}
-	.youtube-embed-container>div {
-		padding: 0px;
-		margin: 0px;
-		box-shadow: 0px 1px 11px -3px;
-		border-radius: 3px;
-		background-color: #ffffff;
-		display: inline-block;
-	}
+    .youtube-embed-container {
+        text-align: center;
+        box-shadow: 0px 0px 0px 0px #000;
+    }
+    .youtube-embed-container>div {
+        padding: 0px;
+        margin: 0px;
+        box-shadow: 0px 1px 11px -3px;
+        border-radius: 3px;
+        background-color: #ffffff;
+        display: inline-block;
+    }
 }
 
 .responsive-youtube-embed {
-	margin: 0px;
-	padding: 0px;
-	border-style: none;
-	border-width: 0px;
-	display: block;
-	border-radius: inherit;
+    margin: 0px;
+    padding: 0px;
+    border-style: none;
+    border-width: 0px;
+    display: block;
+    border-radius: inherit;
 }
 
 @media only screen and (min-width : 320px) {
-	.responsive-youtube-embed {
-		width: 320px;
-		height: 180px;
-	}
+    .responsive-youtube-embed {
+        width: 320px;
+        height: 180px;
+    }
 }
 
 @media only screen and (min-width : 480px) {
-	.responsive-youtube-embed {
-		width: 480px;
-		height: 270px;
-	}
+    .responsive-youtube-embed {
+        width: 480px;
+        height: 270px;
+    }
 }
 
 @media only screen and (min-width : 768px) {
-	.responsive-youtube-embed {
-		width: 750px;
-		height: 421.875px;
-	}
+    .responsive-youtube-embed {
+        width: 750px;
+        height: 421.875px;
+    }
 }
 
 @media only screen and (min-width : 992px) {
-	.responsive-youtube-embed {
-		width: 970px;
-		height: 545.625px;
-	}
+    .responsive-youtube-embed {
+        width: 970px;
+        height: 545.625px;
+    }
 }
 
 @media only screen and (min-width : 1200px) {
-	.responsive-youtube-embed {
-		width: 1171px;
-		height: 658.6875px;
-	}
+    .responsive-youtube-embed {
+        width: 1171px;
+        height: 658.6875px;
+    }
 }
 
 @media (max-width: 767px) {
-	#home-page-rowdyhacks-image {
-		background-size: 767px 575px;
-	}
-	
-	#home-page-rowdyhacks-image>div.col-sm-12 {
-		height: 200px;
-	}
-	
-	#about-page-tamuhacks-image {
-		background-size: 767px 575px;
-	}
-	
-	#about-page-tamuhacks-image>div.col-sm-12 {
-		height: 200px;
-	}
+    #home-page-rowdyhacks-image {
+        background-size: 767px 575px;
+    }
+    
+    #home-page-rowdyhacks-image>div.col-sm-12 {
+        height: 200px;
+    }
+    
+    #about-page-tamuhacks-image {
+        background-size: 767px 575px;
+    }
+    
+    #about-page-tamuhacks-image>div.col-sm-12 {
+        height: 200px;
+    }
 }
 
 @media (max-width: 767px) {
-	#home-page-rowdyhacks-image {
-		background-size: 767px 575px;
-	}
-	
-	#about-page-tamuhacks-image {
-		background-size: 767px 575px;
-	}
+    #home-page-rowdyhacks-image {
+        background-size: 767px 575px;
+    }
+    
+    #about-page-tamuhacks-image {
+        background-size: 767px 575px;
+    }
 }
 
 /****************************
-	Footer
+    Footer
 ****************************/
 #footer {
-	padding: 20px 30px;
+    padding: 20px 30px;
 }
 
 .footer-social {
-	color: #204972;
-	margin: 0px 5px;
-	text-decoration: none;
+    color: #204972;
+    margin: 0px 5px;
+    text-decoration: none;
 }
 
 .footer-social:hover, .footer-social:active {
-	color: #87c115;
-	text-decoration: none;
+    color: #87c115;
+    text-decoration: none;
 }
 
 #copyright-container {
-	text-align: left;
-	margin: 0px;
+    text-align: left;
+    margin: 0px;
 }
 
 #social-media-container {
-	text-align: right;
-	margin: 0px;
+    text-align: right;
+    margin: 0px;
 }
 
 @media (max-width: 767px) {
-	#social-media-container {
-		text-align: center;
-		margin: 20px;
-	}
-	#copyright-container {
-		text-align: center;
-	}
+    #social-media-container {
+        text-align: center;
+        margin: 20px;
+    }
+    #copyright-container {
+        text-align: center;
+    }
 }
diff --git a/dues.php b/dues.php
index 689d8e2..3957587 100644
--- a/dues.php
+++ b/dues.php
@@ -1,87 +1,87 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<?php
-			require('common/head-includes.php');
-		?>
+    <head>
+        <?php
+            require('common/head-includes.php');
+        ?>
         <title>Pay Dues | Association for Computing Machinery UTSA</title>
-	</head>
-	<body>
-		<?php
-			require('common/menu.php');
-		?>
-		<div id="content" class="container">
-			<div class="row">
-				<div class="col-sm-12">
-					<!-- content here! -->
-					<h1 class="content-title">
-						Dues
-					</h1>
-					<?php
-						require_once('./config.php');
-						$month = date('n', time());
-						$year = date('Y', time());
-						$current_semester;
-						if($month < 6){
-							$current_semester = 'Spring ' . $year;
-						}
-						else{
-							$current_semester = 'Fall ' . $year;
-						}
-					?>
-					<div id="stripe-button-container">
-						<script type="text/javascript">
-							$(document).ready(function(){
-								$("#fake-stripe-button").on('click',function(){
-									$(".stripe-button-el").click();
-								});
-							});
-						</script>
-						<div style="display:none;">
-							<form action="process_dues.php" method="post">
-								<script src="https://checkout.stripe.com/checkout.js" class="stripe-button"
-									data-key="<?php echo $stripe['publishable_key']; ?>"
-									data-description="Dues for <?php echo($current_semester); ?>"
-									data-amount="1500"
-									data-locale="auto"
-									data-label="Pay with Card or Bitcoin"
-									data-currency="usd"
-									data-bitcoin="true"
-									>
-								</script>
-							</form>
-						</div>
-					</div>
-					<div>
-					</div>
-					<div class="row section-container" style="margin-top:50px;">
-						<div class="col-sm-1">
-						</div>
-						<div class="col-sm-7" style="font-size:24px;">
-							<p>
-								We think it's awesome to have snacks at meetings. Prizes, travel reimbursements, t-shirts,
-								and other cool benefits for ACM members are all funded by dues. Dues are just $15 per semester. We spend all of our funds giving back to members and doing cool stuff.
-							</p>
-						</div>
-						<div class="col-sm-1">
-						</div>
-						<div class="col-sm-3" style="padding-top:60px;text-align:center;">
-							<!--
-								<h3>
-									Coming Soon
-								</h3>
-								<div style="background-color:grey;color:white;padding:5px;border-radius:3px;display:inline-block;cursor:default;">
-									Pay Dues
-								</div>
-							-->
-							<input type="button" value="Pay Dues" id="fake-stripe-button" />
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-		<?php
-			require('common/footer.php');
-		?>
-	</body>
+    </head>
+    <body>
+        <?php
+            require('common/menu.php');
+        ?>
+        <div id="content" class="container">
+            <div class="row">
+                <div class="col-sm-12">
+                    <!-- content here! -->
+                    <h1 class="content-title">
+                        Dues
+                    </h1>
+                    <?php
+                        require_once('./config.php');
+                        $month = date('n', time());
+                        $year = date('Y', time());
+                        $current_semester;
+                        if($month < 6){
+                            $current_semester = 'Spring ' . $year;
+                        }
+                        else{
+                            $current_semester = 'Fall ' . $year;
+                        }
+                    ?>
+                    <div id="stripe-button-container">
+                        <script type="text/javascript">
+                            $(document).ready(function(){
+                                $("#fake-stripe-button").on('click',function(){
+                                    $(".stripe-button-el").click();
+                                });
+                            });
+                        </script>
+                        <div style="display:none;">
+                            <form action="process_dues.php" method="post">
+                                <script src="https://checkout.stripe.com/checkout.js" class="stripe-button"
+                                    data-key="<?php echo $stripe['publishable_key']; ?>"
+                                    data-description="Dues for <?php echo($current_semester); ?>"
+                                    data-amount="1500"
+                                    data-locale="auto"
+                                    data-label="Pay with Card or Bitcoin"
+                                    data-currency="usd"
+                                    data-bitcoin="true"
+                                    >
+                                </script>
+                            </form>
+                        </div>
+                    </div>
+                    <div>
+                    </div>
+                    <div class="row section-container" style="margin-top:50px;">
+                        <div class="col-sm-1">
+                        </div>
+                        <div class="col-sm-7" style="font-size:24px;">
+                            <p>
+                                We think it's awesome to have snacks at meetings. Prizes, travel reimbursements, t-shirts,
+                                and other cool benefits for ACM members are all funded by dues. Dues are just $15 per semester. We spend all of our funds giving back to members and doing cool stuff.
+                            </p>
+                        </div>
+                        <div class="col-sm-1">
+                        </div>
+                        <div class="col-sm-3" style="padding-top:60px;text-align:center;">
+                            <!--
+                                <h3>
+                                    Coming Soon
+                                </h3>
+                                <div style="background-color:grey;color:white;padding:5px;border-radius:3px;display:inline-block;cursor:default;">
+                                    Pay Dues
+                                </div>
+                            -->
+                            <input type="button" value="Pay Dues" id="fake-stripe-button" />
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <?php
+            require('common/footer.php');
+        ?>
+    </body>
 </html>
diff --git a/groups.php b/groups.php
index 5f8ba58..329465f 100755
--- a/groups.php
+++ b/groups.php
@@ -1,152 +1,152 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<?php
-			require('common/head-includes.php');
-		?>
+    <head>
+        <?php
+            require('common/head-includes.php');
+        ?>
         <title>Groups | Association for Computing Machinery UTSA</title>
-	</head>
-	<body>
-		<?php
-			require('common/menu.php');
-		?>
-		<div id="content" class="container">
-			<div class="row">
-				<div class="col-sm-12">
-					<h1>ACM Groups &amp; Committees</h1>
-					<p>
+    </head>
+    <body>
+        <?php
+            require('common/menu.php');
+        ?>
+        <div id="content" class="container">
+            <div class="row">
+                <div class="col-sm-12">
+                    <h1>ACM Groups &amp; Committees</h1>
+                    <p>
 
-					</p>
-					<div class="row section-container group">
-						<div class="col-sm-12">
-							<h2>ACM-W</h2>
-							<p>
-								ACM-W aims to create an engaging academic, professional, and social network for women and minorities in technology. Our purpose is to connect students with leaders and encourage them to pursue career opportunities in computing fields and to mentor for academic and professional success.
-							</p>
-							<!--
-							<h3>Primary Contacts</h3>
-							<p>
-								Bridget Rios, <em>President</em>
-								<br>
-								Alifya Musa, <em>Vice-President</em>
-							</p>
-							-->
-						</div>
-					</div>
-					<!--
-					<div class="row section-container group">
-						<div class="col-sm-12">
-							<h2>
-								Web Development
-							</h2>
-							<p>
-								The ACM Web Development group is dedicated to designing, developing, and
-								publishing the chapter's website and all associated web content. We also
-								encourage members to develop and work on their own projects.
-								<br />
-								For more information, join the <strong>#web-dev</strong> channel on Slack.
-							</p>
-							<h3>Meeting Times</h3>
-							<p>
-								Mondays from 3:00pm to 4:00pm in NPB 4.140
-							</p>
-							<h3>Primary Contacts</h3>
-							<p>
-								Andrew Hutton, <em>Media Officer</em>
-							</p>
-						</div>
-					</div>
-					<div class="row section-container group">
-						<div class="col-sm-12">
-							<h2>
-								Python
-							</h2>
-							<p>
-								The ACM Python group provides a place for members to practice and learn more 
-								about Python. Python is on the command line, on the web, in research; Python 
-								is everywhere.
-							</p>
-							<h3>Meeting Times</h3>
-							<p>
-								Tuesdays from 2:30pm to 3:30pm in NPB 4.140
-							</p>
-							<h3>Primary Contacts</h3>
-							<p>
-								Luke Taylor, <em>Social Events Officer</em>
-							</p>
-						</div>
-					</div>
-					<div class="row section-container group">
-						<div class="col-sm-12">
-							<h2>
-								AI Group
-							</h2>
-							<p>
-								ACM's Artificial Intelligence Group researces and shares new ideas on AI and 
-								machine learning, ranging from neural networks to game development. The group 
-								discusses how to integrate AI into new and old projects and, occasionally, how 
-								to prevent AI from taking over.
-							</p>
-							<h3>Meeting Times</h3>
-							<p>
-							Wednesdays from 2:00pm to 3:00pm in NPB 4.140
-							</p>
-							<h3>Primary Contacts</h3>
-							<p>
-								Trase Westbrook, <em>President</em>
-							</p>
-						</div>
-					</div>
-					-->
-					<div class="row section-container group">
-						<div class="col-sm-12">
-							<h2>
-								RowdyHacks Planning
-							</h2>
-							<p>
-								RowdyHacks is UTSA's offical annual hackathon hosted by ACM.
-							</p>
-							<p>
-								Every year, members from ACM get together to help plan and organize RowdyHacks.
-								It is a great way to get involved and to learn about organizing events. So
-								whether you are a seasoned veteran, or new to hackathons, everyone is encouraged
-								to be a part of the planning commitee.
-							</p>
-							<p>
-								For more information reach out to us to see how you can get involved.
-							</p>
-							<!--
-							<h3>Primary Contact</h3>
-							<p>
-								Andrew Benett, <em>RowdyHacks Coordinator</em>
-							</p>
-							-->
-						</div>
-					</div>
-					<!--
-					<div class="row section-container group">
-						<div class="col-sm-12">
-							<h2>
-								ACM-ICPC
-							</h2>
-							<p>
-								The ACM-ICPC, or International Collegiate Programming Contest, is
-								a world-wide programming contest where thousands of 3-person teams
-								compete by solving anywhere from 8 to 12 algorithm problems of varying
-								difficulty, from easy to extremely hard.
-							</p>
-							<p>
-								If you are interested in joining the UTSA ICPC team for the 2017-2018 school year,
-								join the <strong>#icpc</strong> channel on Slack.
-							</p>
-						</div>
-					</div>
-					-->
-				</div>
-			</div>
-		</div>
-		<?php
-			require('common/footer.php');
-		?>
-	</body>
+                    </p>
+                    <div class="row section-container group">
+                        <div class="col-sm-12">
+                            <h2>ACM-W</h2>
+                            <p>
+                                ACM-W aims to create an engaging academic, professional, and social network for women and minorities in technology. Our purpose is to connect students with leaders and encourage them to pursue career opportunities in computing fields and to mentor for academic and professional success.
+                            </p>
+                            <!--
+                            <h3>Primary Contacts</h3>
+                            <p>
+                                Bridget Rios, <em>President</em>
+                                <br>
+                                Alifya Musa, <em>Vice-President</em>
+                            </p>
+                            -->
+                        </div>
+                    </div>
+                    <!--
+                    <div class="row section-container group">
+                        <div class="col-sm-12">
+                            <h2>
+                                Web Development
+                            </h2>
+                            <p>
+                                The ACM Web Development group is dedicated to designing, developing, and
+                                publishing the chapter's website and all associated web content. We also
+                                encourage members to develop and work on their own projects.
+                                <br />
+                                For more information, join the <strong>#web-dev</strong> channel on Slack.
+                            </p>
+                            <h3>Meeting Times</h3>
+                            <p>
+                                Mondays from 3:00pm to 4:00pm in NPB 4.140
+                            </p>
+                            <h3>Primary Contacts</h3>
+                            <p>
+                                Andrew Hutton, <em>Media Officer</em>
+                            </p>
+                        </div>
+                    </div>
+                    <div class="row section-container group">
+                        <div class="col-sm-12">
+                            <h2>
+                                Python
+                            </h2>
+                            <p>
+                                The ACM Python group provides a place for members to practice and learn more 
+                                about Python. Python is on the command line, on the web, in research; Python 
+                                is everywhere.
+                            </p>
+                            <h3>Meeting Times</h3>
+                            <p>
+                                Tuesdays from 2:30pm to 3:30pm in NPB 4.140
+                            </p>
+                            <h3>Primary Contacts</h3>
+                            <p>
+                                Luke Taylor, <em>Social Events Officer</em>
+                            </p>
+                        </div>
+                    </div>
+                    <div class="row section-container group">
+                        <div class="col-sm-12">
+                            <h2>
+                                AI Group
+                            </h2>
+                            <p>
+                                ACM's Artificial Intelligence Group researces and shares new ideas on AI and 
+                                machine learning, ranging from neural networks to game development. The group 
+                                discusses how to integrate AI into new and old projects and, occasionally, how 
+                                to prevent AI from taking over.
+                            </p>
+                            <h3>Meeting Times</h3>
+                            <p>
+                            Wednesdays from 2:00pm to 3:00pm in NPB 4.140
+                            </p>
+                            <h3>Primary Contacts</h3>
+                            <p>
+                                Trase Westbrook, <em>President</em>
+                            </p>
+                        </div>
+                    </div>
+                    -->
+                    <div class="row section-container group">
+                        <div class="col-sm-12">
+                            <h2>
+                                RowdyHacks Planning
+                            </h2>
+                            <p>
+                                RowdyHacks is UTSA's offical annual hackathon hosted by ACM.
+                            </p>
+                            <p>
+                                Every year, members from ACM get together to help plan and organize RowdyHacks.
+                                It is a great way to get involved and to learn about organizing events. So
+                                whether you are a seasoned veteran, or new to hackathons, everyone is encouraged
+                                to be a part of the planning commitee.
+                            </p>
+                            <p>
+                                For more information reach out to us to see how you can get involved.
+                            </p>
+                            <!--
+                            <h3>Primary Contact</h3>
+                            <p>
+                                Andrew Benett, <em>RowdyHacks Coordinator</em>
+                            </p>
+                            -->
+                        </div>
+                    </div>
+                    <!--
+                    <div class="row section-container group">
+                        <div class="col-sm-12">
+                            <h2>
+                                ACM-ICPC
+                            </h2>
+                            <p>
+                                The ACM-ICPC, or International Collegiate Programming Contest, is
+                                a world-wide programming contest where thousands of 3-person teams
+                                compete by solving anywhere from 8 to 12 algorithm problems of varying
+                                difficulty, from easy to extremely hard.
+                            </p>
+                            <p>
+                                If you are interested in joining the UTSA ICPC team for the 2017-2018 school year,
+                                join the <strong>#icpc</strong> channel on Slack.
+                            </p>
+                        </div>
+                    </div>
+                    -->
+                </div>
+            </div>
+        </div>
+        <?php
+            require('common/footer.php');
+        ?>
+    </body>
 </html>
diff --git a/index.php b/index.php
index 6ffe503..2dedce5 100644
--- a/index.php
+++ b/index.php
@@ -1,70 +1,70 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<?php
-			require('common/head-includes.php');
-		?>
+    <head>
+        <?php
+            require('common/head-includes.php');
+        ?>
         <title>The Association for Computing Machinery &mdash; UTSA</title>
-	</head>
-	<body>
-		<?php
-			require('common/menu.php');
-		?>
-		<div id="content" class="container">
-			<div class="row">
-				<div class="col-sm-12">
-					<div class="row section-container" id="home-page-rowdyhacks-image">
-						<div class="col-sm-12">
-						</div>
-					</div>
-					<div class="row section-container">
-						<div class="col-sm-12">
-							<h1>
-								Meetings
-							</h1>
-							<p>
-							    <?php
-							        if(time() > 1534982400){
-							            //less than 1 week before meetings start
-							            echo('Meetings are held on a weekly basis at UTSA\'s main campus from 3-4 on Wednesdays in the NPB. We also have special events that we share on <a href="#slack-container">Slack</a> and post to our <a href="calendar">calendar</a>.');
-							        }
-							        else{
-							            //more than one week before meetings start
-							            echo('Meetings will be held on a weekly basis at UTSA\'s main campus from 3-4 on Wednesdays in the NPB, starting August 29th. We also have special events that we share on <a href="#slack-container">Slack</a> and post to our <a href="calendar">calendar</a>.');
-							        }
-							    ?>
-							</p>
-						</div>
-					</div>
-					<div class="row section-container" style="display:table;" id="slack-container">
-						<div class="col-sm-8">
-							<h1>
-								Slack
-							</h1>
-							<p>
-								Want to share notes from class? Want to hear about events on campus or talk about the latest and greatest stuff in technology? From app development to unix security, ACM has people who share your interests. The best way to get connected with other students and hear about upcoming events, is through <a href="http://acm-utsa.slack.com">Slack</a>. We use Slack to share information about internships, events, and opportunities at UTSA and around town. Members can recieve an invitation to join by sending an email to <a href="mailto:acm.utsa@gmail.com">acm.utsa@gmail.com</a> or by contacting one of our <a href="officers.php">officers</a>.
-							</p>
-						</div>
-						<div class="col-sm-4 hidden-xs">
-							<div style="margin:120px 0px 0px 0px;text-align: center;">
-								<a class="link" href="slack_invite.php" target="_blank">
-									<input type="button" style="outline-style: none;" value="Request Slack Invite" />
-								</a>
-							</div>
-						</div>
-						<div class="col-sm-4 hidden-sm hidden-md hidden-lg hidden-xl">
-							<div style="margin:40px 0px 0px 0px;text-align: center;">
-								<a href="slack_invite.php">
-									<input type="button" style="outline-style: none;" value="Request Slack Invite" />
-								</a>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-		<?php
-			require('common/footer.php');
-		?>
-	</body>
+    </head>
+    <body>
+        <?php
+            require('common/menu.php');
+        ?>
+        <div id="content" class="container">
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="row section-container" id="home-page-rowdyhacks-image">
+                        <div class="col-sm-12">
+                        </div>
+                    </div>
+                    <div class="row section-container">
+                        <div class="col-sm-12">
+                            <h1>
+                                Meetings
+                            </h1>
+                            <p>
+                                <?php
+                                    if(time() > 1534982400){
+                                        //less than 1 week before meetings start
+                                        echo('Meetings are held on a weekly basis at UTSA\'s main campus from 3-4 on Wednesdays in the NPB. We also have special events that we share on <a href="#slack-container">Slack</a> and post to our <a href="calendar">calendar</a>.');
+                                    }
+                                    else{
+                                        //more than one week before meetings start
+                                        echo('Meetings will be held on a weekly basis at UTSA\'s main campus from 3-4 on Wednesdays in the NPB, starting August 29th. We also have special events that we share on <a href="#slack-container">Slack</a> and post to our <a href="calendar">calendar</a>.');
+                                    }
+                                ?>
+                            </p>
+                        </div>
+                    </div>
+                    <div class="row section-container" style="display:table;" id="slack-container">
+                        <div class="col-sm-8">
+                            <h1>
+                                Slack
+                            </h1>
+                            <p>
+                                Want to share notes from class? Want to hear about events on campus or talk about the latest and greatest stuff in technology? From app development to unix security, ACM has people who share your interests. The best way to get connected with other students and hear about upcoming events, is through <a href="http://acm-utsa.slack.com">Slack</a>. We use Slack to share information about internships, events, and opportunities at UTSA and around town. Members can recieve an invitation to join by sending an email to <a href="mailto:acm.utsa@gmail.com">acm.utsa@gmail.com</a> or by contacting one of our <a href="officers.php">officers</a>.
+                            </p>
+                        </div>
+                        <div class="col-sm-4 hidden-xs">
+                            <div style="margin:120px 0px 0px 0px;text-align: center;">
+                                <a class="link" href="slack_invite.php" target="_blank">
+                                    <input type="button" style="outline-style: none;" value="Request Slack Invite" />
+                                </a>
+                            </div>
+                        </div>
+                        <div class="col-sm-4 hidden-sm hidden-md hidden-lg hidden-xl">
+                            <div style="margin:40px 0px 0px 0px;text-align: center;">
+                                <a href="slack_invite.php">
+                                    <input type="button" style="outline-style: none;" value="Request Slack Invite" />
+                                </a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <?php
+            require('common/footer.php');
+        ?>
+    </body>
 </html>
diff --git a/join.php b/join.php
index 5b3cf18..4d83ae9 100644
--- a/join.php
+++ b/join.php
@@ -1,49 +1,49 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<?php
-			require('common/head-includes.php');
-		?>
+    <head>
+        <?php
+            require('common/head-includes.php');
+        ?>
         <title>Join Us | Association for Computing Machinery UTSA</title>
-	</head>
-	<body>
-		<?php
-			require('common/menu.php');
-		?>
-		<div id="content" class="container">
-			<div class="row">
-				<div class="col-sm-12">
-					<div class="row section-container">
-						<div class="col-sm-12">
-							<!-- content here! -->
-							<h1>Joining ACM</h1>
-							<p>
-								As the premier computer science organization at UTSA, joining ACM is one of the best
-								choices you can make to build your network (and your resume) outside
-								of the classroom. Extra-curricular activities are essential to getting your dream job
-								and creating a fulfilling college experience, and we're here to help.
-							</p>
-							<p>
-								There are only two steps to become a member of our chapter:
-							</p>
-							<ul>
-								<li>Attend our general meetings</li>
-								<li><a href="dues">Pay our membership dues of $15.00 per semester</a></li>
-							</ul>
-							<p>
-								Once you pay your dues, you will become a full member of
-								ACM UTSA and enjoy all of the benefits. We strongly believe
-								that membership participation is vital to creating a fun
-								and engaging experience, so the only thing we ask of our
-								members is to actively participate in our meetings and events.
-							</p>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-		<?php
-			require('common/footer.php');
-		?>
-	</body>
+    </head>
+    <body>
+        <?php
+            require('common/menu.php');
+        ?>
+        <div id="content" class="container">
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="row section-container">
+                        <div class="col-sm-12">
+                            <!-- content here! -->
+                            <h1>Joining ACM</h1>
+                            <p>
+                                As the premier computer science organization at UTSA, joining ACM is one of the best
+                                choices you can make to build your network (and your resume) outside
+                                of the classroom. Extra-curricular activities are essential to getting your dream job
+                                and creating a fulfilling college experience, and we're here to help.
+                            </p>
+                            <p>
+                                There are only two steps to become a member of our chapter:
+                            </p>
+                            <ul>
+                                <li>Attend our general meetings</li>
+                                <li><a href="dues">Pay our membership dues of $15.00 per semester</a></li>
+                            </ul>
+                            <p>
+                                Once you pay your dues, you will become a full member of
+                                ACM UTSA and enjoy all of the benefits. We strongly believe
+                                that membership participation is vital to creating a fun
+                                and engaging experience, so the only thing we ask of our
+                                members is to actively participate in our meetings and events.
+                            </p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <?php
+            require('common/footer.php');
+        ?>
+    </body>
 </html>
diff --git a/laptops.php b/laptops.php
index 2101de5..e570a28 100755
--- a/laptops.php
+++ b/laptops.php
@@ -1,67 +1,67 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<?php
-			require('common/head-includes.php');
-		?>
-		<title>The Association for Computing Machinery &mdash; UTSA</title>
-		<style type="text/css">
-			.laptop-list-item {
-				margin: 10px;
-			}
-		</style>
-	</head>
-	<body>
-		<?php
-			require('common/menu.php');
-		?>
-		<div id="content" class="container">
-			<div class="row">
-				<div class="col-sm-12">
-					<!--
-					<div class="row section-container" id="home-page-rowdyhacks-image">
-						<div class="col-sm-12">
-						</div>
-					</div>
-					-->
-					<div class="row section-container">
-						<div class="col-sm-12">
-							There are several options for new students to be able to use linux on their laptops. These are the four options we recommend.
-							<ol>
-								<li class="laptop-list-item">
-									<b>Buy a laptop with linux preinstalled.</b>
-									<br />
-									The main benefit of this choice is that you know the operating system will have working drivers, and fewer
+    <head>
+        <?php
+            require('common/head-includes.php');
+        ?>
+        <title>The Association for Computing Machinery &mdash; UTSA</title>
+        <style type="text/css">
+            .laptop-list-item {
+                margin: 10px;
+            }
+        </style>
+    </head>
+    <body>
+        <?php
+            require('common/menu.php');
+        ?>
+        <div id="content" class="container">
+            <div class="row">
+                <div class="col-sm-12">
+                    <!--
+                    <div class="row section-container" id="home-page-rowdyhacks-image">
+                        <div class="col-sm-12">
+                        </div>
+                    </div>
+                    -->
+                    <div class="row section-container">
+                        <div class="col-sm-12">
+                            There are several options for new students to be able to use linux on their laptops. These are the four options we recommend.
+                            <ol>
+                                <li class="laptop-list-item">
+                                    <b>Buy a laptop with linux preinstalled.</b>
+                                    <br />
+                                    The main benefit of this choice is that you know the operating system will have working drivers, and fewer
         possible issues than if you install linux yourself. Same applies for macOS.
-								</li>
-								<li class="laptop-list-item">
-									<b>Dual Boot.</b>
-									<br />
-									This will allow you to have both Windows and linux installed but is the most technical solution. You
+                                </li>
+                                <li class="laptop-list-item">
+                                    <b>Dual Boot.</b>
+                                    <br />
+                                    This will allow you to have both Windows and linux installed but is the most technical solution. You
         will need to format your hard drive into multiple partitions, and install linux on the new one. It may
         also require you to find and install drivers on linux.
-								</li>
-								<li class="laptop-list-item">
-									<b>Installing Virtual Box.</b>
-									<br />
-									If you are hesitant about the first two options.  Then installing virtual box will allow
-									you to have a linux, windows, or macOS environment. The main benefit is that you do not have to change
-									your current laptop environment.
-								</li>
-								<li class="laptop-list-item">
-									<b>SSH.</b>
-									<br />
-									This will allow you to ssh into the servers on campus, and maintain a persistent environment. The main
+                                </li>
+                                <li class="laptop-list-item">
+                                    <b>Installing Virtual Box.</b>
+                                    <br />
+                                    If you are hesitant about the first two options.  Then installing virtual box will allow
+                                    you to have a linux, windows, or macOS environment. The main benefit is that you do not have to change
+                                    your current laptop environment.
+                                </li>
+                                <li class="laptop-list-item">
+                                    <b>SSH.</b>
+                                    <br />
+                                    This will allow you to ssh into the servers on campus, and maintain a persistent environment. The main
         issue is that it will be mostly command line programs that you can run.
-								</li>
-							</ol>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-		<?php
-			require('common/footer.php');
-		?>
-	</body>
+                                </li>
+                            </ol>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <?php
+            require('common/footer.php');
+        ?>
+    </body>
 </html>
diff --git a/officers.php b/officers.php
index db7d088..8536351 100644
--- a/officers.php
+++ b/officers.php
@@ -1,597 +1,597 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<?php
-			require('common/head-includes.php');
-		?>
+    <head>
+        <?php
+            require('common/head-includes.php');
+        ?>
         <title>
-        	Officers | Association for Computing Machinery UTSA
+            Officers | Association for Computing Machinery UTSA
         </title>
         <style type="text/css">
-        	.officer-card {
-        		width: 260px;
-        		height: ;
-        		/*box-shadow: 0px 1px 15px -7px;*/
-        		border-radius: 5px;
-        		display: inline-block;
-        		padding: 20px;
-        		text-align: center;
-        		/*
-				box-shadow: 0px 1px 11px -3px;
-				border-radius: 3px;
-				background-color: #ffffff;
-				*/
-				box-shadow: 0px 1px 11px -3px;
-				margin: 10px;
-				border-radius: 3px;
-				background-color: #ffffff;
-        	}
-        	.officer-card-photo-container {
-        		width: 220px;
-        		height: 220px;
-        		overflow: hidden;
-        	}
-        	.officer-card-photo {
-        		width: 220px;
-        		height: 220px;
-        		border-radius: 1000px;
-        	}
-        	.officer-card-name {
-        		padding: 0px;
-        		margin: 5px;
-        	}
-        	.officer-card-title {
-        		padding: 0px;
-        		margin: 10px 15px 15px 15px;
-        		height: 46px;
-        		/*
-        		background-color:green;
-        		*/
-        	}
-        	.officer-card-contact {
-        		display: inline-block;
-        		padding: 0px;
-        		margin: 5px;
-        		background-color: #204972;
-        		color: #FFFFFF;
-        		text-decoration: none;
-        		padding: 10px;
-        		border-radius: 2px;
-        		position: relative;
-        		top: 0px;
-        		box-shadow: 0px 0px 0px #000000;
-        	}
-        	.officer-card-contact:hover {
-        		position: relative;
-        		top: -5px;
-        		box-shadow: 0px 5px 10px -5px #000000;
-        	}
-        	#officer-cards-container {
-        		text-align: center;
-        	}
-			@media (min-width: 500px) and (max-width: 992px) {
-				.officer-card-photo-container, .officer-card-photo {
-					width: 190px;
-					height: 190px;
-				}
-				.officer-card {
-					width: 210px;
-					margin: 15px;
-					padding: 10px;
-				}
-				.officer-card-title {
-					font-size: 20px;
-					height: 38px
-				}
-				.officer-card-contact {
-					font-size: 14px;
-				}
-			}
-			@media (max-width: 499px) {
-				.officer-card-photo-container, .officer-card-photo {
-					width: 250px;
-					height: 250px;
-				}
-				.officer-card {
-					width: 290px;
-					margin: 7px 15px 8px 15px;
-				}
-				.officer-card {
-					padding: 15px;
-				}
-			}
-			@media (max-width: 349px) {
-				#content-row {
-					margin:0px 0px 0px -15px;
-				}
-			}
+            .officer-card {
+                width: 260px;
+                height: ;
+                /*box-shadow: 0px 1px 15px -7px;*/
+                border-radius: 5px;
+                display: inline-block;
+                padding: 20px;
+                text-align: center;
+                /*
+                box-shadow: 0px 1px 11px -3px;
+                border-radius: 3px;
+                background-color: #ffffff;
+                */
+                box-shadow: 0px 1px 11px -3px;
+                margin: 10px;
+                border-radius: 3px;
+                background-color: #ffffff;
+            }
+            .officer-card-photo-container {
+                width: 220px;
+                height: 220px;
+                overflow: hidden;
+            }
+            .officer-card-photo {
+                width: 220px;
+                height: 220px;
+                border-radius: 1000px;
+            }
+            .officer-card-name {
+                padding: 0px;
+                margin: 5px;
+            }
+            .officer-card-title {
+                padding: 0px;
+                margin: 10px 15px 15px 15px;
+                height: 46px;
+                /*
+                background-color:green;
+                */
+            }
+            .officer-card-contact {
+                display: inline-block;
+                padding: 0px;
+                margin: 5px;
+                background-color: #204972;
+                color: #FFFFFF;
+                text-decoration: none;
+                padding: 10px;
+                border-radius: 2px;
+                position: relative;
+                top: 0px;
+                box-shadow: 0px 0px 0px #000000;
+            }
+            .officer-card-contact:hover {
+                position: relative;
+                top: -5px;
+                box-shadow: 0px 5px 10px -5px #000000;
+            }
+            #officer-cards-container {
+                text-align: center;
+            }
+            @media (min-width: 500px) and (max-width: 992px) {
+                .officer-card-photo-container, .officer-card-photo {
+                    width: 190px;
+                    height: 190px;
+                }
+                .officer-card {
+                    width: 210px;
+                    margin: 15px;
+                    padding: 10px;
+                }
+                .officer-card-title {
+                    font-size: 20px;
+                    height: 38px
+                }
+                .officer-card-contact {
+                    font-size: 14px;
+                }
+            }
+            @media (max-width: 499px) {
+                .officer-card-photo-container, .officer-card-photo {
+                    width: 250px;
+                    height: 250px;
+                }
+                .officer-card {
+                    width: 290px;
+                    margin: 7px 15px 8px 15px;
+                }
+                .officer-card {
+                    padding: 15px;
+                }
+            }
+            @media (max-width: 349px) {
+                #content-row {
+                    margin:0px 0px 0px -15px;
+                }
+            }
         </style>
-	</head>
-	<body>
-		<?php
-			require('common/menu.php');
-		?>
-		<div id="content" class="container">
-			<div class="row" id="#content-row">
-				<div class="col-sm-12">
-					<!-- content here! -->
-					<h1 class="content-title">
-						Officers
-					</h1>
-					<div id="officer-cards-container">
-						<!--
-						<div class="officer-card">
-							<div class="officer-card-photo-container">
-								<img src="images/officer_photos/shane_becker.jpg" class="officer-card-photo" />
-							</div>
-							<h3 class="officer-card-title">
-								President
-							</h3>
-							<h4 class="officer-card-name">
-								Shane Becker
-							</h3>
-							<a href="mailto:acm.utsa@gmail.com">
-								<p class="officer-card-contact">
-									acm.utsa@gmail.com
-								</p>
-							</a>
-						</div>
-						<div class="officer-card">
-							<div class="officer-card-photo-container">
-								<img src="images/officer_photos/nishant_grover.jpg" class="officer-card-photo" />
-							</div>
-							<h3 class="officer-card-title">
-								Vice President
-							</h3>
-							<h4 class="officer-card-name">
-								Nishant Grover
-							</h3>
-							<a href="mailto:acm.utsa@gmail.com">
-								<p class="officer-card-contact">
-									acm.utsa@gmail.com
-								</p>
-							</a>
-						</div>
-						<div class="officer-card">
-							<div class="officer-card-photo-container">
-								<img src="images/officer_photos/andrew_hutton.jpg" class="officer-card-photo" />
-							</div>
-							<h3 class="officer-card-title">
-								Secretary
-							</h3>
-							<h4 class="officer-card-name">
-								Andrew Hutton
-							</h3>
-							<a href="http://hutton.tech">
-								<p class="officer-card-contact">
-									hutton.tech
-								</p>
-							</a>
-						</div>
-						<div class="officer-card">
-							<div class="officer-card-photo-container">
-								<img src="images/officer_photos/jason_blig.jpg" class="officer-card-photo" />
-							</div>
-							<h3 class="officer-card-title">
-								Treasurer
-							</h3>
-							<h4 class="officer-card-name">
-								Jason Blig
-							</h3>
-							<p class="officer-card-contact" style="color:#fff;" onmouseover="this.style.color='#fff'">
-								-
-							</p>
-						</div>
-						<div class="officer-card">
-							<div class="officer-card-photo-container">
-								<img src="images/officer_photos/melissa_gonzalez.jpg" class="officer-card-photo" />
-							</div>
-							<h3 class="officer-card-title">
-								Public Relations Chair
-							</h3>
-							<h4 class="officer-card-name">
-								Melissa Gonzalez
-							</h3>
-							<p class="officer-card-contact" style="color:#fff;" onmouseover="this.style.color='#fff'">
-								-
-							</p>
-						</div>
-						<div class="officer-card">
-							<div class="officer-card-photo-container">
-								<img src="images/officer_photos/diego_romero.jpg" class="officer-card-photo" />
-							</div>
-							<h3 class="officer-card-title">
-								Social Events Chair
-							</h3>
-							<h4 class="officer-card-name">
-								Diego Romero
-							</h3>
-							<p class="officer-card-contact" style="color:#fff;" onmouseover="this.style.color='#fff'">
-								-
-							</p>
-						</div>
-						<div class="officer-card">
-							<div class="officer-card-photo-container">
-								<img src="images/officer_photos/andrew_sanetra.jpg" class="officer-card-photo" />
-							</div>
-							<h3 class="officer-card-title">
-								Media Chair
-							</h3>
-							<h4 class="officer-card-name">
-								Andrew Sanetra
-							</h3>
-							<p class="officer-card-contact" style="color:#fff;" onmouseover="this.style.color='#fff'">
-								-
-							</p>
-						</div>
-						<div class="officer-card">
-							<div class="officer-card-photo-container">
-								<img src="images/officer_photos/chris_doege.jpg" class="officer-card-photo" />
-							</div>
-							<h3 class="officer-card-title">
-								Projects Chair
-							</h3>
-							<h4 class="officer-card-name">
-								Chris Doege
-							</h3>
-							<a href="http://doege.pw">
-								<p class="officer-card-contact">
-									doege.pw
-								</p>
-							</a>
-						</div>
-						-->
-						
-						<!--
-						<div class="officer-card">
-							<div class="officer-card-photo-container">
-								<img src="images/officer_photos/2017/trase_westbrook.jpg" class="officer-card-photo" />
-							</div>
-							<h3 class="officer-card-title">
-								President
-							</h3>
-							<h4 class="officer-card-name">
-								Trase Westbrook
-							</h3>
-							<a href="contact.php?position=president">
-								<p class="officer-card-contact">
-									Contact
-								</p>
-							</a>
-						</div>
-						<div class="officer-card">
-							<div class="officer-card-photo-container">
-								<img src="images/officer_photos/2017/myka_hancevic.jpg" class="officer-card-photo" />
-							</div>
-							<h3 class="officer-card-title">
-								Vice President
-							</h3>
-							<h4 class="officer-card-name">
-								Myka Hancevic
-							</h3>
-							<a href="contact.php?position=vice-president">
-								<p class="officer-card-contact">
-									Contact
-								</p>
-							</a>
-						</div>
-						<div class="officer-card">
-							<div class="officer-card-photo-container">
-								<img src="images/officer_photos/2017/dalton_sumrall.jpg" class="officer-card-photo" />
-							</div>
-							<h3 class="officer-card-title">
-								Secretary
-							</h3>
-							<h4 class="officer-card-name">
-								Dalton Sumrall
-							</h3>
-							<a href="contact.php?position=secretary">
-								<p class="officer-card-contact">
-									Contact
-								</p>
-							</a>
-						</div>
-						<div class="officer-card">
-							<div class="officer-card-photo-container">
-								<img src="images/officer_photos/2017/julia_vasquez.jpg" class="officer-card-photo" />
-							</div>
-							<h3 class="officer-card-title">
-								Treasurer
-							</h3>
-							<h4 class="officer-card-name">
-								Julia Vasquez
-							</h3>
-							<a href="contact.php?position=treasurer">
-								<p class="officer-card-contact">
-									Contact
-								</p>
-							</a>
-						</div>
-						<div class="officer-card">
-							<div class="officer-card-photo-container">
-								<img src="images/officer_photos/2017/cassidy_matousek.jpg" class="officer-card-photo" />
-							</div>
-							<h3 class="officer-card-title">
-								ACM-W Chair
-							</h3>
-							<h4 class="officer-card-name">
-								Cassidy Matousek
-							</h3>
-							<a href="contact.php?position=acmw-chair">
-								<p class="officer-card-contact">
-									Contact
-								</p>
-							</a>
-						</div>
-						<div class="officer-card">
-							<div class="officer-card-photo-container">
-								<img src="images/officer_photos/2017/soe_than.jpg" class="officer-card-photo" />
-							</div>
-							<h3 class="officer-card-title">
-								Public Relations Officer
-							</h3>
-							<h4 class="officer-card-name">
-								Soe Than
-							</h3>
-							<a href="contact.php?position=pr">
-								<p class="officer-card-contact">
-									Contact
-								</p>
-							</a>
-						</div>
-						<div class="officer-card">
-							<div class="officer-card-photo-container">
-								<img src="images/officer_photos/2017/luke_taylor.jpg" class="officer-card-photo" />
-							</div>
-							<h3 class="officer-card-title">
-								Social Events Officer
-							</h3>
-							<h4 class="officer-card-name">
-								Luke Taylor
-							</h3>
-							<a href="contact.php?position=social">
-								<p class="officer-card-contact">
-									Contact
-								</p>
-							</a>
-						</div>
-						<div class="officer-card">
-							<div class="officer-card-photo-container">
-								<img src="images/officer_photos/default.jpg" class="officer-card-photo" />
-							</div>
-							<h3 class="officer-card-title">
-								Media Officer
-							</h3>
-							<h4 class="officer-card-name">
-								Austin Carpenter
-							</h3>
-							<a href="contact.php?position=media">
-								<p class="officer-card-contact">
-									Contact
-								</p>
-							</a>
-						</div>
-						<div class="officer-card">
-							<div class="officer-card-photo-container">
-								<img src="images/officer_photos/default.jpg" class="officer-card-photo" />
-							</div>
-							<h3 class="officer-card-title">
-								Projects Officer
-							</h3>
-							<h4 class="officer-card-name">
-								Gustavo Chavez
-							</h3>
-							<a href="contact.php?position=projects">
-								<p class="officer-card-contact">
-									Contact
-								</p>
-							</a>
-						</div>
-						-->
-						
-						<div class="officer-card">
-							<div class="officer-card-photo-container">
-								<img src="images/officer_photos/default.jpg" class="officer-card-photo" />
-							</div>
-							<h3 class="officer-card-title">
-								President
-							</h3>
-							<h4 class="officer-card-name">
-								Austin Carpenter
-							</h3>
-							<a href="contact.php?position=president">
-								<p class="officer-card-contact">
-									Contact
-								</p>
-							</a>
-						</div>
-						<div class="officer-card">
-							<div class="officer-card-photo-container">
-								<img src="images/officer_photos/default.jpg" class="officer-card-photo" />
-							</div>
-							<h3 class="officer-card-title">
-								Vice President
-							</h3>
-							<h4 class="officer-card-name">
-								Carla Cardenas
-							</h3>
-							<a href="contact.php?position=vice-president">
-								<p class="officer-card-contact">
-									Contact
-								</p>
-							</a>
-						</div>
-						<div class="officer-card">
-							<div class="officer-card-photo-container">
-								<img src="images/officer_photos/default.jpg" class="officer-card-photo" />
-							</div>
-							<h3 class="officer-card-title">
-								Secretary
-							</h3>
-							<h4 class="officer-card-name">
-								Tehya Garza
-							</h3>
-							<a href="contact.php?position=secretary">
-								<p class="officer-card-contact">
-									Contact
-								</p>
-							</a>
-						</div>
-						<div class="officer-card">
-							<div class="officer-card-photo-container">
-								<img src="images/officer_photos/default.jpg" class="officer-card-photo" />
-							</div>
-							<h3 class="officer-card-title">
-								Treasurer
-							</h3>
-							<h4 class="officer-card-name">
-								Victoria Huerta
-							</h3>
-							<a href="contact.php?position=treasurer">
-								<p class="officer-card-contact">
-									Contact
-								</p>
-							</a>
-						</div>
-						<!--
-						<div class="officer-card">
-							<div class="officer-card-photo-container">
-								<img src="images/officer_photos/default.jpg" class="officer-card-photo" />
-							</div>
-							<h3 class="officer-card-title">
-								ACM-W Chair
-							</h3>
-							<h4 class="officer-card-name">
-								Cassidy Matousek
-							</h3>
-							<a href="contact.php?position=acmw-chair">
-								<p class="officer-card-contact">
-									Contact
-								</p>
-							</a>
-						</div>
-						-->
-						<div class="officer-card">
-							<div class="officer-card-photo-container">
-								<img src="images/officer_photos/default.jpg" class="officer-card-photo" />
-							</div>
-							<h3 class="officer-card-title">
-								RowdyHacks Chair
-							</h3>
-							<h4 class="officer-card-name">
-								Matt Moore
-							</h3>
-							<a href="contact.php?position=rowdyhacks-chair">
-								<p class="officer-card-contact">
-									Contact
-								</p>
-							</a>
-						</div>
-						<div class="officer-card">
-							<div class="officer-card-photo-container">
-								<img src="images/officer_photos/default.jpg" class="officer-card-photo" />
-							</div>
-							<h3 class="officer-card-title">
-								Public Relations Officer
-							</h3>
-							<h4 class="officer-card-name">
-								Nicholas Rillera
-							</h3>
-							<a href="contact.php?position=pr">
-								<p class="officer-card-contact">
-									Contact
-								</p>
-							</a>
-						</div>
-						<div class="officer-card">
-							<div class="officer-card-photo-container">
-								<img src="images/officer_photos/default.jpg" class="officer-card-photo" />
-							</div>
-							<h3 class="officer-card-title">
-								Social Events Officer
-							</h3>
-							<h4 class="officer-card-name">
-								John Le
-							</h3>
-							<a href="contact.php?position=social">
-								<p class="officer-card-contact">
-									Contact
-								</p>
-							</a>
-						</div>
-						<div class="officer-card">
-							<div class="officer-card-photo-container">
-								<img src="images/officer_photos/default.jpg" class="officer-card-photo" />
-							</div>
-							<h3 class="officer-card-title">
-								Media Officer
-							</h3>
-							<h4 class="officer-card-name">
-								Jeanine Vasquez
-							</h3>
-							<a href="contact.php?position=media">
-								<p class="officer-card-contact">
-									Contact
-								</p>
-							</a>
-						</div>
-						<div class="officer-card">
-							<div class="officer-card-photo-container">
-								<img src="images/officer_photos/default.jpg" class="officer-card-photo" />
-							</div>
-							<h3 class="officer-card-title">
-								Projects Officer
-							</h3>
-							<h4 class="officer-card-name">
-								Gustavo Chavez
-							</h3>
-							<a href="contact.php?position=projects">
-								<p class="officer-card-contact">
-									Contact
-								</p>
-							</a>
-						</div>
-						<div class="officer-card">
-							<div class="officer-card-photo-container">
-								<img src="images/officer_photos/default.jpg" class="officer-card-photo" />
-							</div>
-							<h3 class="officer-card-title">
-								Membership Officer
-							</h3>
-							<h4 class="officer-card-name">
-								Samuel Burnett
-							</h3>
-							<a href="contact.php?position=membership">
-								<p class="officer-card-contact">
-									Contact
-								</p>
-							</a>
-						</div>
-						
-						<!--
-							<div class="officer-card">
-								<div class="officer-card-photo-container">
-									<img src="images/officer_photos/default.jpg" class="officer-card-photo" />
-								</div>
-								<h3 class="officer-card-title">
-									Officer
-								</h3>
-								<h4 class="officer-card-name">
-									First Last
-								</h3>
-								<a href="mailto:acm.utsa@gmail.com">
-									<p class="officer-card-contact">
-										acm.utsa@gmail.com
-									</p>
-								</a>
-							</div>
-						-->
-					</div>
-				</div>
-			</div>
-		</div>
-		<?php
-			require('common/footer.php');
-		?>
-	</body>
+    </head>
+    <body>
+        <?php
+            require('common/menu.php');
+        ?>
+        <div id="content" class="container">
+            <div class="row" id="#content-row">
+                <div class="col-sm-12">
+                    <!-- content here! -->
+                    <h1 class="content-title">
+                        Officers
+                    </h1>
+                    <div id="officer-cards-container">
+                        <!--
+                        <div class="officer-card">
+                            <div class="officer-card-photo-container">
+                                <img src="images/officer_photos/shane_becker.jpg" class="officer-card-photo" />
+                            </div>
+                            <h3 class="officer-card-title">
+                                President
+                            </h3>
+                            <h4 class="officer-card-name">
+                                Shane Becker
+                            </h3>
+                            <a href="mailto:acm.utsa@gmail.com">
+                                <p class="officer-card-contact">
+                                    acm.utsa@gmail.com
+                                </p>
+                            </a>
+                        </div>
+                        <div class="officer-card">
+                            <div class="officer-card-photo-container">
+                                <img src="images/officer_photos/nishant_grover.jpg" class="officer-card-photo" />
+                            </div>
+                            <h3 class="officer-card-title">
+                                Vice President
+                            </h3>
+                            <h4 class="officer-card-name">
+                                Nishant Grover
+                            </h3>
+                            <a href="mailto:acm.utsa@gmail.com">
+                                <p class="officer-card-contact">
+                                    acm.utsa@gmail.com
+                                </p>
+                            </a>
+                        </div>
+                        <div class="officer-card">
+                            <div class="officer-card-photo-container">
+                                <img src="images/officer_photos/andrew_hutton.jpg" class="officer-card-photo" />
+                            </div>
+                            <h3 class="officer-card-title">
+                                Secretary
+                            </h3>
+                            <h4 class="officer-card-name">
+                                Andrew Hutton
+                            </h3>
+                            <a href="http://hutton.tech">
+                                <p class="officer-card-contact">
+                                    hutton.tech
+                                </p>
+                            </a>
+                        </div>
+                        <div class="officer-card">
+                            <div class="officer-card-photo-container">
+                                <img src="images/officer_photos/jason_blig.jpg" class="officer-card-photo" />
+                            </div>
+                            <h3 class="officer-card-title">
+                                Treasurer
+                            </h3>
+                            <h4 class="officer-card-name">
+                                Jason Blig
+                            </h3>
+                            <p class="officer-card-contact" style="color:#fff;" onmouseover="this.style.color='#fff'">
+                                -
+                            </p>
+                        </div>
+                        <div class="officer-card">
+                            <div class="officer-card-photo-container">
+                                <img src="images/officer_photos/melissa_gonzalez.jpg" class="officer-card-photo" />
+                            </div>
+                            <h3 class="officer-card-title">
+                                Public Relations Chair
+                            </h3>
+                            <h4 class="officer-card-name">
+                                Melissa Gonzalez
+                            </h3>
+                            <p class="officer-card-contact" style="color:#fff;" onmouseover="this.style.color='#fff'">
+                                -
+                            </p>
+                        </div>
+                        <div class="officer-card">
+                            <div class="officer-card-photo-container">
+                                <img src="images/officer_photos/diego_romero.jpg" class="officer-card-photo" />
+                            </div>
+                            <h3 class="officer-card-title">
+                                Social Events Chair
+                            </h3>
+                            <h4 class="officer-card-name">
+                                Diego Romero
+                            </h3>
+                            <p class="officer-card-contact" style="color:#fff;" onmouseover="this.style.color='#fff'">
+                                -
+                            </p>
+                        </div>
+                        <div class="officer-card">
+                            <div class="officer-card-photo-container">
+                                <img src="images/officer_photos/andrew_sanetra.jpg" class="officer-card-photo" />
+                            </div>
+                            <h3 class="officer-card-title">
+                                Media Chair
+                            </h3>
+                            <h4 class="officer-card-name">
+                                Andrew Sanetra
+                            </h3>
+                            <p class="officer-card-contact" style="color:#fff;" onmouseover="this.style.color='#fff'">
+                                -
+                            </p>
+                        </div>
+                        <div class="officer-card">
+                            <div class="officer-card-photo-container">
+                                <img src="images/officer_photos/chris_doege.jpg" class="officer-card-photo" />
+                            </div>
+                            <h3 class="officer-card-title">
+                                Projects Chair
+                            </h3>
+                            <h4 class="officer-card-name">
+                                Chris Doege
+                            </h3>
+                            <a href="http://doege.pw">
+                                <p class="officer-card-contact">
+                                    doege.pw
+                                </p>
+                            </a>
+                        </div>
+                        -->
+                        
+                        <!--
+                        <div class="officer-card">
+                            <div class="officer-card-photo-container">
+                                <img src="images/officer_photos/2017/trase_westbrook.jpg" class="officer-card-photo" />
+                            </div>
+                            <h3 class="officer-card-title">
+                                President
+                            </h3>
+                            <h4 class="officer-card-name">
+                                Trase Westbrook
+                            </h3>
+                            <a href="contact.php?position=president">
+                                <p class="officer-card-contact">
+                                    Contact
+                                </p>
+                            </a>
+                        </div>
+                        <div class="officer-card">
+                            <div class="officer-card-photo-container">
+                                <img src="images/officer_photos/2017/myka_hancevic.jpg" class="officer-card-photo" />
+                            </div>
+                            <h3 class="officer-card-title">
+                                Vice President
+                            </h3>
+                            <h4 class="officer-card-name">
+                                Myka Hancevic
+                            </h3>
+                            <a href="contact.php?position=vice-president">
+                                <p class="officer-card-contact">
+                                    Contact
+                                </p>
+                            </a>
+                        </div>
+                        <div class="officer-card">
+                            <div class="officer-card-photo-container">
+                                <img src="images/officer_photos/2017/dalton_sumrall.jpg" class="officer-card-photo" />
+                            </div>
+                            <h3 class="officer-card-title">
+                                Secretary
+                            </h3>
+                            <h4 class="officer-card-name">
+                                Dalton Sumrall
+                            </h3>
+                            <a href="contact.php?position=secretary">
+                                <p class="officer-card-contact">
+                                    Contact
+                                </p>
+                            </a>
+                        </div>
+                        <div class="officer-card">
+                            <div class="officer-card-photo-container">
+                                <img src="images/officer_photos/2017/julia_vasquez.jpg" class="officer-card-photo" />
+                            </div>
+                            <h3 class="officer-card-title">
+                                Treasurer
+                            </h3>
+                            <h4 class="officer-card-name">
+                                Julia Vasquez
+                            </h3>
+                            <a href="contact.php?position=treasurer">
+                                <p class="officer-card-contact">
+                                    Contact
+                                </p>
+                            </a>
+                        </div>
+                        <div class="officer-card">
+                            <div class="officer-card-photo-container">
+                                <img src="images/officer_photos/2017/cassidy_matousek.jpg" class="officer-card-photo" />
+                            </div>
+                            <h3 class="officer-card-title">
+                                ACM-W Chair
+                            </h3>
+                            <h4 class="officer-card-name">
+                                Cassidy Matousek
+                            </h3>
+                            <a href="contact.php?position=acmw-chair">
+                                <p class="officer-card-contact">
+                                    Contact
+                                </p>
+                            </a>
+                        </div>
+                        <div class="officer-card">
+                            <div class="officer-card-photo-container">
+                                <img src="images/officer_photos/2017/soe_than.jpg" class="officer-card-photo" />
+                            </div>
+                            <h3 class="officer-card-title">
+                                Public Relations Officer
+                            </h3>
+                            <h4 class="officer-card-name">
+                                Soe Than
+                            </h3>
+                            <a href="contact.php?position=pr">
+                                <p class="officer-card-contact">
+                                    Contact
+                                </p>
+                            </a>
+                        </div>
+                        <div class="officer-card">
+                            <div class="officer-card-photo-container">
+                                <img src="images/officer_photos/2017/luke_taylor.jpg" class="officer-card-photo" />
+                            </div>
+                            <h3 class="officer-card-title">
+                                Social Events Officer
+                            </h3>
+                            <h4 class="officer-card-name">
+                                Luke Taylor
+                            </h3>
+                            <a href="contact.php?position=social">
+                                <p class="officer-card-contact">
+                                    Contact
+                                </p>
+                            </a>
+                        </div>
+                        <div class="officer-card">
+                            <div class="officer-card-photo-container">
+                                <img src="images/officer_photos/default.jpg" class="officer-card-photo" />
+                            </div>
+                            <h3 class="officer-card-title">
+                                Media Officer
+                            </h3>
+                            <h4 class="officer-card-name">
+                                Austin Carpenter
+                            </h3>
+                            <a href="contact.php?position=media">
+                                <p class="officer-card-contact">
+                                    Contact
+                                </p>
+                            </a>
+                        </div>
+                        <div class="officer-card">
+                            <div class="officer-card-photo-container">
+                                <img src="images/officer_photos/default.jpg" class="officer-card-photo" />
+                            </div>
+                            <h3 class="officer-card-title">
+                                Projects Officer
+                            </h3>
+                            <h4 class="officer-card-name">
+                                Gustavo Chavez
+                            </h3>
+                            <a href="contact.php?position=projects">
+                                <p class="officer-card-contact">
+                                    Contact
+                                </p>
+                            </a>
+                        </div>
+                        -->
+                        
+                        <div class="officer-card">
+                            <div class="officer-card-photo-container">
+                                <img src="images/officer_photos/default.jpg" class="officer-card-photo" />
+                            </div>
+                            <h3 class="officer-card-title">
+                                President
+                            </h3>
+                            <h4 class="officer-card-name">
+                                Austin Carpenter
+                            </h3>
+                            <a href="contact.php?position=president">
+                                <p class="officer-card-contact">
+                                    Contact
+                                </p>
+                            </a>
+                        </div>
+                        <div class="officer-card">
+                            <div class="officer-card-photo-container">
+                                <img src="images/officer_photos/default.jpg" class="officer-card-photo" />
+                            </div>
+                            <h3 class="officer-card-title">
+                                Vice President
+                            </h3>
+                            <h4 class="officer-card-name">
+                                Carla Cardenas
+                            </h3>
+                            <a href="contact.php?position=vice-president">
+                                <p class="officer-card-contact">
+                                    Contact
+                                </p>
+                            </a>
+                        </div>
+                        <div class="officer-card">
+                            <div class="officer-card-photo-container">
+                                <img src="images/officer_photos/default.jpg" class="officer-card-photo" />
+                            </div>
+                            <h3 class="officer-card-title">
+                                Secretary
+                            </h3>
+                            <h4 class="officer-card-name">
+                                Tehya Garza
+                            </h3>
+                            <a href="contact.php?position=secretary">
+                                <p class="officer-card-contact">
+                                    Contact
+                                </p>
+                            </a>
+                        </div>
+                        <div class="officer-card">
+                            <div class="officer-card-photo-container">
+                                <img src="images/officer_photos/default.jpg" class="officer-card-photo" />
+                            </div>
+                            <h3 class="officer-card-title">
+                                Treasurer
+                            </h3>
+                            <h4 class="officer-card-name">
+                                Victoria Huerta
+                            </h3>
+                            <a href="contact.php?position=treasurer">
+                                <p class="officer-card-contact">
+                                    Contact
+                                </p>
+                            </a>
+                        </div>
+                        <!--
+                        <div class="officer-card">
+                            <div class="officer-card-photo-container">
+                                <img src="images/officer_photos/default.jpg" class="officer-card-photo" />
+                            </div>
+                            <h3 class="officer-card-title">
+                                ACM-W Chair
+                            </h3>
+                            <h4 class="officer-card-name">
+                                Cassidy Matousek
+                            </h3>
+                            <a href="contact.php?position=acmw-chair">
+                                <p class="officer-card-contact">
+                                    Contact
+                                </p>
+                            </a>
+                        </div>
+                        -->
+                        <div class="officer-card">
+                            <div class="officer-card-photo-container">
+                                <img src="images/officer_photos/default.jpg" class="officer-card-photo" />
+                            </div>
+                            <h3 class="officer-card-title">
+                                RowdyHacks Chair
+                            </h3>
+                            <h4 class="officer-card-name">
+                                Matt Moore
+                            </h3>
+                            <a href="contact.php?position=rowdyhacks-chair">
+                                <p class="officer-card-contact">
+                                    Contact
+                                </p>
+                            </a>
+                        </div>
+                        <div class="officer-card">
+                            <div class="officer-card-photo-container">
+                                <img src="images/officer_photos/default.jpg" class="officer-card-photo" />
+                            </div>
+                            <h3 class="officer-card-title">
+                                Public Relations Officer
+                            </h3>
+                            <h4 class="officer-card-name">
+                                Nicholas Rillera
+                            </h3>
+                            <a href="contact.php?position=pr">
+                                <p class="officer-card-contact">
+                                    Contact
+                                </p>
+                            </a>
+                        </div>
+                        <div class="officer-card">
+                            <div class="officer-card-photo-container">
+                                <img src="images/officer_photos/default.jpg" class="officer-card-photo" />
+                            </div>
+                            <h3 class="officer-card-title">
+                                Social Events Officer
+                            </h3>
+                            <h4 class="officer-card-name">
+                                John Le
+                            </h3>
+                            <a href="contact.php?position=social">
+                                <p class="officer-card-contact">
+                                    Contact
+                                </p>
+                            </a>
+                        </div>
+                        <div class="officer-card">
+                            <div class="officer-card-photo-container">
+                                <img src="images/officer_photos/default.jpg" class="officer-card-photo" />
+                            </div>
+                            <h3 class="officer-card-title">
+                                Media Officer
+                            </h3>
+                            <h4 class="officer-card-name">
+                                Jeanine Vasquez
+                            </h3>
+                            <a href="contact.php?position=media">
+                                <p class="officer-card-contact">
+                                    Contact
+                                </p>
+                            </a>
+                        </div>
+                        <div class="officer-card">
+                            <div class="officer-card-photo-container">
+                                <img src="images/officer_photos/default.jpg" class="officer-card-photo" />
+                            </div>
+                            <h3 class="officer-card-title">
+                                Projects Officer
+                            </h3>
+                            <h4 class="officer-card-name">
+                                Gustavo Chavez
+                            </h3>
+                            <a href="contact.php?position=projects">
+                                <p class="officer-card-contact">
+                                    Contact
+                                </p>
+                            </a>
+                        </div>
+                        <div class="officer-card">
+                            <div class="officer-card-photo-container">
+                                <img src="images/officer_photos/default.jpg" class="officer-card-photo" />
+                            </div>
+                            <h3 class="officer-card-title">
+                                Membership Officer
+                            </h3>
+                            <h4 class="officer-card-name">
+                                Samuel Burnett
+                            </h3>
+                            <a href="contact.php?position=membership">
+                                <p class="officer-card-contact">
+                                    Contact
+                                </p>
+                            </a>
+                        </div>
+                        
+                        <!--
+                            <div class="officer-card">
+                                <div class="officer-card-photo-container">
+                                    <img src="images/officer_photos/default.jpg" class="officer-card-photo" />
+                                </div>
+                                <h3 class="officer-card-title">
+                                    Officer
+                                </h3>
+                                <h4 class="officer-card-name">
+                                    First Last
+                                </h3>
+                                <a href="mailto:acm.utsa@gmail.com">
+                                    <p class="officer-card-contact">
+                                        acm.utsa@gmail.com
+                                    </p>
+                                </a>
+                            </div>
+                        -->
+                    </div>
+                </div>
+            </div>
+        </div>
+        <?php
+            require('common/footer.php');
+        ?>
+    </body>
 </html>
diff --git a/process_dues.php b/process_dues.php
index 8ad10cf..88aa499 100644
--- a/process_dues.php
+++ b/process_dues.php
@@ -1,55 +1,55 @@
 <?php
-	require_once('./config.php');
-	
-	$token  = $_POST['stripeToken'];
-	
-	$customer = \Stripe\Customer::create(array(
-		'email' => 'customer@example.com',
-		'source' => $token
-	));
-	
-	$charge = \Stripe\Charge::create(array(
-		'customer' => $customer->id,
-		'amount' => 1500,
-		'currency' => 'usd'
-	));
+    require_once('./config.php');
+    
+    $token  = $_POST['stripeToken'];
+    
+    $customer = \Stripe\Customer::create(array(
+        'email' => 'customer@example.com',
+        'source' => $token
+    ));
+    
+    $charge = \Stripe\Charge::create(array(
+        'customer' => $customer->id,
+        'amount' => 1500,
+        'currency' => 'usd'
+    ));
 ?>
 <!DOCTYPE html>
 <html>
-	<head>
-		<?php
-			require('common/head-includes.php');
-		?>
+    <head>
+        <?php
+            require('common/head-includes.php');
+        ?>
         <title>Pay Dues | Association for Computing Machinery UTSA</title>
-	</head>
-	<body>
-		<?php
-			require('common/menu.php');
-		?>
-		<div id="content" class="container">
-			<div class="row">
-				<div class="col-sm-12">
-					<!-- content here! -->
-					<div class="row partial-section-container">
-						<div class="col-sm-12 col-md-8">
-							<div class="partial-section">
-								Payment Successful
-								<br />
-								<br />
-								Thank you!
-								<br />
-								<br />
-								Please take a moment to enjoy this kitten picture.
-							</div>
-						</div>
-						<div class="col-sm-12 col-md-4" style="overflow:hidden;">
-							<div class="partial-section" style="max-height:300px;">
-								<img src="images/photos/min/Cute-kittens-12929201-1600-1200.jpg" style="max-width:120%;margin: -80px -30px -30px -30px;" alt="the kitten picture" title="the kitten picture" />
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</body>
+    </head>
+    <body>
+        <?php
+            require('common/menu.php');
+        ?>
+        <div id="content" class="container">
+            <div class="row">
+                <div class="col-sm-12">
+                    <!-- content here! -->
+                    <div class="row partial-section-container">
+                        <div class="col-sm-12 col-md-8">
+                            <div class="partial-section">
+                                Payment Successful
+                                <br />
+                                <br />
+                                Thank you!
+                                <br />
+                                <br />
+                                Please take a moment to enjoy this kitten picture.
+                            </div>
+                        </div>
+                        <div class="col-sm-12 col-md-4" style="overflow:hidden;">
+                            <div class="partial-section" style="max-height:300px;">
+                                <img src="images/photos/min/Cute-kittens-12929201-1600-1200.jpg" style="max-width:120%;margin: -80px -30px -30px -30px;" alt="the kitten picture" title="the kitten picture" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </body>
 </html>
diff --git a/resources.php b/resources.php
index 059f40d..51d5c50 100644
--- a/resources.php
+++ b/resources.php
@@ -1,28 +1,28 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<?php
-			require('common/head-includes.php');
-		?>
+    <head>
+        <?php
+            require('common/head-includes.php');
+        ?>
         <title>Resources | Association for Computing Machinery UTSA</title>
-	</head>
-	<body>
-		<?php
-			require('common/menu.php');
-		?>
-		<div id="content" class="container">
-			<div class="row">
-				<div class="col-sm-12">
-					<div class="row section-container">
-						<div class="col-sm-12">
-							We have laptop recommendations <a href="laptops">here</a>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-		<?php
-			require('common/footer.php');
-		?>
-	</body>
+    </head>
+    <body>
+        <?php
+            require('common/menu.php');
+        ?>
+        <div id="content" class="container">
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="row section-container">
+                        <div class="col-sm-12">
+                            We have laptop recommendations <a href="laptops">here</a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <?php
+            require('common/footer.php');
+        ?>
+    </body>
 </html>
diff --git a/send_message.php b/send_message.php
index 44094a8..85f3d72 100644
--- a/send_message.php
+++ b/send_message.php
@@ -6,45 +6,45 @@
 $sender = $_POST['name'] . $_POST['m-email'];
 
 if(strlen($text) <= 1 || strlen($sender) <= 1 || strlen($from) <= 1){
-	die('Please complete all fields of the contact form.');
+    die('Please complete all fields of the contact form.');
 }
 
 $recipient = 'ACM UTSA';
 if($_POST['recipient'] == 'president'){
-	$recipient = 'Trase Westbrook';
-	$to = 'acm.utsa@gmail.com';
+    $recipient = 'Trase Westbrook';
+    $to = 'acm.utsa@gmail.com';
 }
 else if($_POST['recipient'] == 'vice-president'){
-	$recipient = 'Myka Hancevic';
-	$to = 'acm.utsa@gmail.com';
+    $recipient = 'Myka Hancevic';
+    $to = 'acm.utsa@gmail.com';
 }
 else if($_POST['recipient'] == 'president'){
-	$recipient = 'Dalton Sumrall';
-	$to = 'acm.utsa@gmail.com';
+    $recipient = 'Dalton Sumrall';
+    $to = 'acm.utsa@gmail.com';
 }
 else if($_POST['recipient'] == 'treasurer'){
-	$recipient = 'Julia Vasquez';
-	$to = 'acm.utsa@gmail.com';
+    $recipient = 'Julia Vasquez';
+    $to = 'acm.utsa@gmail.com';
 }
 else if($_POST['recipient'] == 'pr'){
-	$recipient = 'Soe Than';
-	$to = 'acm.utsa@gmail.com';
+    $recipient = 'Soe Than';
+    $to = 'acm.utsa@gmail.com';
 }
 else if($_POST['recipient'] == 'media'){
-	$recipient = 'Austin Carpenter';
-	$to = 'acm.utsa@gmail.com';
+    $recipient = 'Austin Carpenter';
+    $to = 'acm.utsa@gmail.com';
 }
 else if($_POST['recipient'] == 'social'){
-	$recipient = 'Luke Taylor';
-	$to = 'acm.utsa@gmail.com';
+    $recipient = 'Luke Taylor';
+    $to = 'acm.utsa@gmail.com';
 }
 else if($_POST['recipient'] == 'projects'){
-	$recipient = 'Gustavo Chavez';
-	$to = 'acm.utsa@gmail.com';
+    $recipient = 'Gustavo Chavez';
+    $to = 'acm.utsa@gmail.com';
 }
 else if($_POST['recipient'] == 'acmw-chair'){
-	$recipient = 'Cassidy Matousek';
-	$to = 'acm.utsa@gmail.com';
+    $recipient = 'Cassidy Matousek';
+    $to = 'acm.utsa@gmail.com';
 }
 
 $body = 'Message from acm-utsa.org, sent by ' . htmlentities($sender) . '<br />Email: ' . htmlentities($_POST['email']) . '<br />For: '.htmlentities($recipient).'<br />Message: <br />' . htmlentities($text);
@@ -55,170 +55,170 @@
 
 $message_stat = '';
 if(mail($to, 'Message on acm-utsa.org', $body, $headers)){
-	$message_stat = '1';
+    $message_stat = '1';
 }
 else{
-	$message_stat = '2';
+    $message_stat = '2';
 }
 
 header('Location: contact?message_stat='.rawurlencode($message_stat));
 ?>
 <!DOCTYPE html>
 <html>
-	<head>
-		<?php
-			require('common/head-includes.php');
-		?>
-		<title>Contact Us | Association for Computing Machinery UTSA</title>
-		<style type="text/css">
-			select, input[type="text"], input[type="password"], textarea {
-				background-color: #DFDFDF;
-				border-radius: 3px;
-				border-style: none;
-				outline-color: #204972;
-				outline-width: 1px;
-				outline-style: none;
-				padding-left: 10px;
-				padding-right: 10px;
-			}
-			select:focus, input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
-				outline-style: none;
-				box-shadow: 0px 0px 0px 3px #204972;
-			}
-		</style>
-	</head>
-	<body>
-		<?php
-			require('common/menu.php');
-		?>
-		<div id="content" class="container">
-			<div class="row">
-				<div class="col-sm-12">
-					<div class="row section-container group">
-						<div class="col-sm-12">
-							<h1>Contact Us</h1>
-							<br />
-							<div class="row">
-								<div class="col-sm-8">
-									<p>
-										ACM's primary form of communication is through <a href="index#slack-container">Slack</a> at <a href="http://acm-utsa.slack.com">acm-utsa.slack.com</a> but you can contact us directly through the form below.
-									</p>
-								</div>
-								<div class="col-sm-4" style="text-align:center;">
-									<a class="link" href="slack_invite" target="_blank">
-										<input type="image" src="images/icons/add-to-slack.png" class="slack-button" style="outline-style: none;" />
-									</a>
-								</div>
-							</div>
-							<br />
-							<form action="send_message" method="post">
-								<?php
-									$position = '';
-									if(isset($_GET['position'])){
-										$position = $_GET['position'];
-									}
-								?>
-								<div class="row">
-									<div class="hidden-xs col-sm-12" style="text-align:left;margin-bottom:10px;">
-										<input type="text" name="name" placeholder="Your Name" aria-required="true" style="margin-right: 10px; width: 260px;" />
-										<input type="text" name="email" placeholder="Your Email" aria-required="true" style="width: 260px;" />
-									</div>
-									<div class="col-xs-12 hidden-sm hidden-md hidden-lg hidden-xl" style="text-align:center;margin-top:10px;">
-										<input type="text" name="m-name" placeholder="Your Name" aria-required="true" style="width:100%;" />
-									</div>
-									<div class="col-xs-12 hidden-sm hidden-md hidden-lg hidden-xl" style="text-align:center;margin-top:10px;margin-bottom:10px;">
-										<input type="text" name="m-email" placeholder="Your Email" aria-required="true" style="width:100%;" />
-									</div>
-								</div>
-								<div class="row">
-									<div class="col-md-12">
-										<textarea name="text" placeholder="Your Message" style="width:100%;height:400px;"></textarea>
-									</div>
-								</div>
-								<div class="row">
-									<div class="col-sm-12 hidden-xs" style="text-align:right;">
-										<input type="submit" value="Send" id="contact-form-submit-button" /> to
-										<select name="recipient" style="margin-left:10px;">
-											<option value="acm">
-												ACM UTSA
-											</option>
-											<option value="president"<?php if($position == 'president') echo(' selected');?>>
-												President
-											</option>
-											<option value="vice-president"<?php if($position == 'vice-president') echo(' selected');?>>
-												Vice President
-											</option>
-											<option value="secretary"<?php if($position == 'secretary') echo(' selected');?>>
-												Secretary
-											</option>
-											<option value="treasurer"<?php if($position == 'treasurer') echo(' selected');?>>
-												Treasurer
-											</option>
-											<option value="acmw-chair"<?php if($position == 'acmw-chair') echo(' selected');?>>
-												ACMW Chair
-											</option>
-											<option value="pr"<?php if($position == 'pr') echo(' selected');?>>
-												Public Relations
-											</option>
-											<option value="social"<?php if($position == 'social') echo(' selected');?>>
-												Social Events
-											</option>
-											<option value="media"<?php if($position == 'media') echo(' selected');?>>
-												Media
-											</option>
-											<option value="projects"<?php if($position == 'projects') echo(' selected');?>>
-												Projects
-											</option>
-										</select>
-									</div>
-									<div class="col-xs-12 hidden-sm hidden-md hidden-lg hidden-xl" style="text-align:center;">
-										<input type="submit" value="Send" id="contact-form-submit-button" />
-										<br />
-										to
-									</div>
-									<div class="col-xs-12 hidden-sm hidden-md hidden-lg hidden-xl" style="text-align:center;margin-top:10px;">
-										<select name="recipient">
-											<option value="acm">
-												ACM UTSA
-											</option>
-											<option value="president"<?php if($position == 'president') echo(' selected');?>>
-												President
-											</option>
-											<option value="vice-president"<?php if($position == 'vice-president') echo(' selected');?>>
-												Vice President
-											</option>
-											<option value="secretary"<?php if($position == 'secretary') echo(' selected');?>>
-												Secretary
-											</option>
-											<option value="treasurer"<?php if($position == 'treasurer') echo(' selected');?>>
-												Treasurer
-											</option>
-											<option value="acmw-chair"<?php if($position == 'acmw-chair') echo(' selected');?>>
-												ACMW Chair
-											</option>
-											<option value="pr"<?php if($position == 'pr') echo(' selected');?>>
-												Public Relations
-											</option>
-											<option value="social"<?php if($position == 'social') echo(' selected');?>>
-												Social Events
-											</option>
-											<option value="media"<?php if($position == 'media') echo(' selected');?>>
-												Media
-											</option>
-											<option value="projects"<?php if($position == 'projects') echo(' selected');?>>
-												Projects
-											</option>
-										</select>
-									</div>
-								</div>
-							<form>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-		<?php
-			require('common/footer.php');
-		?>
-	</body>
+    <head>
+        <?php
+            require('common/head-includes.php');
+        ?>
+        <title>Contact Us | Association for Computing Machinery UTSA</title>
+        <style type="text/css">
+            select, input[type="text"], input[type="password"], textarea {
+                background-color: #DFDFDF;
+                border-radius: 3px;
+                border-style: none;
+                outline-color: #204972;
+                outline-width: 1px;
+                outline-style: none;
+                padding-left: 10px;
+                padding-right: 10px;
+            }
+            select:focus, input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
+                outline-style: none;
+                box-shadow: 0px 0px 0px 3px #204972;
+            }
+        </style>
+    </head>
+    <body>
+        <?php
+            require('common/menu.php');
+        ?>
+        <div id="content" class="container">
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="row section-container group">
+                        <div class="col-sm-12">
+                            <h1>Contact Us</h1>
+                            <br />
+                            <div class="row">
+                                <div class="col-sm-8">
+                                    <p>
+                                        ACM's primary form of communication is through <a href="index#slack-container">Slack</a> at <a href="http://acm-utsa.slack.com">acm-utsa.slack.com</a> but you can contact us directly through the form below.
+                                    </p>
+                                </div>
+                                <div class="col-sm-4" style="text-align:center;">
+                                    <a class="link" href="slack_invite" target="_blank">
+                                        <input type="image" src="images/icons/add-to-slack.png" class="slack-button" style="outline-style: none;" />
+                                    </a>
+                                </div>
+                            </div>
+                            <br />
+                            <form action="send_message" method="post">
+                                <?php
+                                    $position = '';
+                                    if(isset($_GET['position'])){
+                                        $position = $_GET['position'];
+                                    }
+                                ?>
+                                <div class="row">
+                                    <div class="hidden-xs col-sm-12" style="text-align:left;margin-bottom:10px;">
+                                        <input type="text" name="name" placeholder="Your Name" aria-required="true" style="margin-right: 10px; width: 260px;" />
+                                        <input type="text" name="email" placeholder="Your Email" aria-required="true" style="width: 260px;" />
+                                    </div>
+                                    <div class="col-xs-12 hidden-sm hidden-md hidden-lg hidden-xl" style="text-align:center;margin-top:10px;">
+                                        <input type="text" name="m-name" placeholder="Your Name" aria-required="true" style="width:100%;" />
+                                    </div>
+                                    <div class="col-xs-12 hidden-sm hidden-md hidden-lg hidden-xl" style="text-align:center;margin-top:10px;margin-bottom:10px;">
+                                        <input type="text" name="m-email" placeholder="Your Email" aria-required="true" style="width:100%;" />
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="col-md-12">
+                                        <textarea name="text" placeholder="Your Message" style="width:100%;height:400px;"></textarea>
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="col-sm-12 hidden-xs" style="text-align:right;">
+                                        <input type="submit" value="Send" id="contact-form-submit-button" /> to
+                                        <select name="recipient" style="margin-left:10px;">
+                                            <option value="acm">
+                                                ACM UTSA
+                                            </option>
+                                            <option value="president"<?php if($position == 'president') echo(' selected');?>>
+                                                President
+                                            </option>
+                                            <option value="vice-president"<?php if($position == 'vice-president') echo(' selected');?>>
+                                                Vice President
+                                            </option>
+                                            <option value="secretary"<?php if($position == 'secretary') echo(' selected');?>>
+                                                Secretary
+                                            </option>
+                                            <option value="treasurer"<?php if($position == 'treasurer') echo(' selected');?>>
+                                                Treasurer
+                                            </option>
+                                            <option value="acmw-chair"<?php if($position == 'acmw-chair') echo(' selected');?>>
+                                                ACMW Chair
+                                            </option>
+                                            <option value="pr"<?php if($position == 'pr') echo(' selected');?>>
+                                                Public Relations
+                                            </option>
+                                            <option value="social"<?php if($position == 'social') echo(' selected');?>>
+                                                Social Events
+                                            </option>
+                                            <option value="media"<?php if($position == 'media') echo(' selected');?>>
+                                                Media
+                                            </option>
+                                            <option value="projects"<?php if($position == 'projects') echo(' selected');?>>
+                                                Projects
+                                            </option>
+                                        </select>
+                                    </div>
+                                    <div class="col-xs-12 hidden-sm hidden-md hidden-lg hidden-xl" style="text-align:center;">
+                                        <input type="submit" value="Send" id="contact-form-submit-button" />
+                                        <br />
+                                        to
+                                    </div>
+                                    <div class="col-xs-12 hidden-sm hidden-md hidden-lg hidden-xl" style="text-align:center;margin-top:10px;">
+                                        <select name="recipient">
+                                            <option value="acm">
+                                                ACM UTSA
+                                            </option>
+                                            <option value="president"<?php if($position == 'president') echo(' selected');?>>
+                                                President
+                                            </option>
+                                            <option value="vice-president"<?php if($position == 'vice-president') echo(' selected');?>>
+                                                Vice President
+                                            </option>
+                                            <option value="secretary"<?php if($position == 'secretary') echo(' selected');?>>
+                                                Secretary
+                                            </option>
+                                            <option value="treasurer"<?php if($position == 'treasurer') echo(' selected');?>>
+                                                Treasurer
+                                            </option>
+                                            <option value="acmw-chair"<?php if($position == 'acmw-chair') echo(' selected');?>>
+                                                ACMW Chair
+                                            </option>
+                                            <option value="pr"<?php if($position == 'pr') echo(' selected');?>>
+                                                Public Relations
+                                            </option>
+                                            <option value="social"<?php if($position == 'social') echo(' selected');?>>
+                                                Social Events
+                                            </option>
+                                            <option value="media"<?php if($position == 'media') echo(' selected');?>>
+                                                Media
+                                            </option>
+                                            <option value="projects"<?php if($position == 'projects') echo(' selected');?>>
+                                                Projects
+                                            </option>
+                                        </select>
+                                    </div>
+                                </div>
+                            <form>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <?php
+            require('common/footer.php');
+        ?>
+    </body>
 </html>
\ No newline at end of file
diff --git a/shell/index.php b/shell/index.php
index 094c581..254f0d3 100644
--- a/shell/index.php
+++ b/shell/index.php
@@ -1,584 +1,584 @@
 <html>
-	<head>
-		<?php
-			include('../common/google-analytics.php');
-		?>
-		<style type="text/css">
-			body{
-				background-color: black;
-				color: green;
-				font-family: courier;
-				font-size:18px;
-			}
-			.command-block{
-				margin: 0px;
-				padding: 0px;
-			}
-			.ps1{
-				display:inline-block;
-			}
-			.stdin{
-				margin: 0px;
-				padding: 0px;
-				display:inline-block;
-			}
-			.stdout{
-				
-			}
-			.help-row{
-				display:block;
-			}
-			.help-item{
-				display:inline-block;
-				width:160px;
-				font-weight:bold;
-			}
-			.help-description{
-				display:inline-block;
-			}
-			#shell-window{
-				min-height:100%;
-				width:100%;
-			}
-		</style>
-		<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
-		<script type="text/javascript">
-			var disallowedCommands = ["rm", "srm", "mkdir", "touch", "ftp", "ssh", "mv", "cp", "chmod", "chown", "mysql", "tar"];
-			// "su" || "sudo"
-			var supportedCommands = ["cd", "ls", "cat", "clear", "vi", "vim", "open", "exit", "help", "pwd", "sudo", "su"];
-			window.processing = false; // indicates whether a command is currently being processed
-			window.commandCancelled = false;
-			window.session_terminated = false;
-			// address of the current directory
-			var pwd = "/";
-			var path = [];
-			var commandHistory = [];
-			var historyIndex = -1;
-			// use the filesystem object to simulate the real filesystem
-			var filesystem = JSON.parse('{"type":"folder","name":"/","address":"/","children":[{"type":"file","name":"about.php","address":"/about.php"},{"type":"file","name":"calendar.php","address":"/calendar.php"},{"type":"file","name":"contact.php","address":"/contact.php"},{"type":"folder","name":"css","address":"/css","children":[{"type":"file","name":"index.css","address":"/css/index.css"},{"type":"file","name":"index.pyp","address":"/css/index.pyp"},{"type":"file","name":"master.css","address":"/css/master.css"}]},{"type":"file","name":"dues.php","address":"/dues.php"},{"type":"file","name":"favicon.ico","address":"/favicon.ico"},{"type":"file","name":"groups.php","address":"/groups.php"},{"type":"folder","name":"images","address":"/images","children":[{"type":"folder","name":"icons","address":"/images/icons","children":[{"type":"file","name":"add-to-slack.png","address":"/images/icons/add-to-slack.png"}]},{"type":"file","name":"logo-bordered.png","address":"/images/logo-bordered.png"},{"type":"file","name":"logo.png","address":"/images/logo.png"},{"type":"folder","name":"officer_photos","address":"/images/officer_photos","children":[{"type":"file","name":"andrew_bennett.jpg","address":"/images/officer_photos/andrew_bennett.jpg"},{"type":"file","name":"andrew_hutton.jpg","address":"/images/officer_photos/andrew_hutton.jpg"},{"type":"file","name":"andrew_sanetra.jpg","address":"/images/officer_photos/andrew_sanetra.jpg"},{"type":"file","name":"chris_doege.jpg","address":"/images/officer_photos/chris_doege.jpg"},{"type":"file","name":"default.jpg","address":"/images/officer_photos/default.jpg"},{"type":"file","name":"diego_romero.jpg","address":"/images/officer_photos/diego_romero.jpg"},{"type":"file","name":"jason_blig.jpg","address":"/images/officer_photos/jason_blig.jpg"},{"type":"file","name":"nishant_grover.jpg","address":"/images/officer_photos/nishant_grover.jpg"},{"type":"file","name":"shane_becker.jpg","address":"/images/officer_photos/shane_becker.jpg"}]}]},{"type":"file","name":"index.php","address":"/index.php"},{"type":"file","name":"join.php","address":"/join.php"},{"type":"file","name":"officers.php","address":"/officers.php"}]}');
-			path = [filesystem];
-			/*
-			var filesystem = JSON.parse('{
-				"type": "folder",
-				"name": "/",
-				"address": "/",
-				"children": [
-					{
-						"type": "file",
-						"name": "about.php",
-						"address": "/about.php"
-					}, {
-						"type": "file",
-						"name": "calendar.php",
-						"address": "/calendar.php"
-					}, {
-						"type": "file",
-						"name": "contact.php",
-						"address": "/contact.php"
-					}, {
-						"type": "folder",
-						"name": "css",
-						"address": "/css",
-						"children": [
-							{
-								"type": "file",
-								"name": "index.css",
-								"address": "/css/index.css"
-							}, {
-								"type": "file",
-								"name": "index.pyp",
-								"address": "/css/index.pyp"
-							}, {
-								"type": "file",
-								"name": "master.css",
-								"address": "/css/master.css"
-							}
-						]
-					}, {
-						"type": "file",
-						"name": "dues.php",
-						"address": "/dues.php"
-					}, {
-						"type": "file",
-						"name": "favicon.ico",
-						"address": "/favicon.ico"
-					}, {
-						"type": "file",
-						"name": "groups.php",
-						"address": "/groups.php"
-					}, {
-						"type": "folder",
-						"name": "images",
-						"address": "/images",
-						"children": [
-							{
-								"type": "folder",
-								"name": "icons",
-								"address": "/images/icons",
-								"children": [
-									{
-										"type": "file",
-										"name": "add-to-slack.png",
-										"address": "/images/icons/add-to-slack.png"
-									}
-								]
-							}, {
-								"type": "file",
-								"name": "logo-bordered.png",
-								"address": "/images/logo-bordered.png"
-							}, {
-								"type": "file",
-								"name": "logo.png",
-								"address": "/images/logo.png"
-							}, {
-								"type": "folder",
-								"name": "officer_photos",
-								"address": "/images/officer_photos",
-								"children": [
-									{
-										"type": "file",
-										"name": "andrew_bennett.jpg",
-										"address": "/images/officer_photos/andrew_bennett.jpg"
-									}, {
-										"type": "file",
-										"name": "andrew_hutton.jpg",
-										"address": "/images/officer_photos/andrew_hutton.jpg"
-									}, {
-										"type": "file",
-										"name": "andrew_sanetra.jpg",
-										"address": "/images/officer_photos/andrew_sanetra.jpg"
-									}, {
-										"type": "file",
-										"name": "chris_doege.jpg",
-										"address": "/images/officer_photos/chris_doege.jpg"
-									}, {
-										"type": "file",
-										"name": "default.jpg",
-										"address": "/images/officer_photos/default.jpg"
-									}, {
-										"type": "file",
-										"name": "diego_romero.jpg",
-										"address": "/images/officer_photos/diego_romero.jpg"
-									}, {
-										"type": "file",
-										"name": "jason_blig.jpg",
-										"address": "/images/officer_photos/jason_blig.jpg"
-									}, {
-										"type": "file",
-										"name": "nishant_grover.jpg",
-										"address": "/images/officer_photos/nishant_grover.jpg"
-									}, {
-										"type": "file",
-										"name": "shane_becker.jpg",
-										"address": "/images/officer_photos/shane_becker.jpg"
-									}
-								]
-							}
-						]
-					}, {
-						"type": "file",
-						"name": "index.php",
-						"address": "/index.php"
-					}, {
-						"type": "file",
-						"name": "join.php",
-						"address": "/join.php"
-					}, {
-						"type": "file",
-						"name": "officers.php",
-						"address": "/officers.php"
-					}
-				]
-			}');
-			*/
-			
-			function get_child_index(parentDir, childName){
-				for(var i = 0; i < parentDir.children.length; i++){
-					if(parentDir.children[i].name == childName){
-						return i;
-					}
-				}
-				return -1;
-			}
-			
-			function get_item(relative_path){
-				var i = 0;
-				var pwd_copy = pwd;
-				var path_copy = JSON.parse(JSON.stringify(path));
-				if(relative_path.charAt(relative_path.length - 1) == '/'){
-					relative_path = relative_path.split("/").slice(0, -1).join("/");
-				}
-				var temp_path = relative_path.split(/\//);
-				if(relative_path.charAt(0) == '/'){
-					pwd_copy = "/";
-					path_copy = [];
-					path_copy[0] = filesystem;
-					temp_path.shift();
-				}
-				var ever = true;
-				for(ever; i < temp_path.length; i++){
-				//  ^ lolz
-					if(temp_path[i] == ".."){
-						if(pwd_copy.split("/").length > 2){
-							pwd_copy = pwd_copy.split("/").slice(0, -1).join("/");
-							path_copy = path_copy.slice(0, -1);
-						}
-						else{
-							pwd_copy = "/";
-							path_copy = [];
-							path_copy[0] = filesystem;
-						}
-					}
-					else{
-						var dir = (path_copy.length > 1) ? path_copy[path_copy.length - 1] : filesystem;
-						var child_index = get_child_index(dir, temp_path[i]);
-						if(child_index == -1){
-							if(pwd_copy == "/"){
-								$("#stdout").html("'" + pwd_copy + temp_path[i] + "' does not exist");
-							}
-							else{
-								$("#stdout").html("'" + pwd_copy + "/" + temp_path[i] + "' does not exist");
-							}
-							i = path_copy.length;
-						}
-						else{
-							path_copy.push(dir.children[child_index]);
-							if(pwd_copy == "/"){
-								pwd_copy += temp_path[i]; //dir.children[child_index].name;
-							}
-							else{
-								pwd_copy += "/" + temp_path[i];
-							}
-						}
-					}
-				}
-				return path_copy[path_copy.length - 1];
-			}
-			
-			function prepare_stdin(){
-				$("#ps1").removeAttr("id");
-				$("#stdin").removeAttr("id");
-				$("#stdout").removeAttr("id");
-				$("#shell-window").append("<div class=\"command-block\"><div class=\"ps1\" id=\"ps1\">acm-utsa.org $&nbsp;</div><div class=\"stdin\" id=\"stdin\">_</div><div class=\"stdout\" id=\"stdout\"></div></div>");
-				$("html, body").scrollTop($(document).height());
-			}
-			
-			$(document).ready(function(){
-				$(window).resize(function(){
-					$(".clear-block").height($(window).height());
-				});
-				document.getElementById('fake-input').focus();
-				$("#fake-input").on("keydown", function(e){
-					var keyCode = e.which || e.keyCode || 0;
-					if(keyCode == 8){
-						// backspace key pressed
-						$("#stdin").text($("#stdin").text().slice(0, -2));
-						window.setTimeout(function(){
-							$("#stdin").append('_');
-						}, 0);
-					}
-				});
-				$(document).on("keydown", function(e){
-					var keyCode = e.which || e.keyCode || 0;
-					window.commandCancelled = (keyCode == 67 || keyCode == 99) && e.ctrlKey;
-					if(keyCode == 38){
-						// up arrow pressed
-						e.preventDefault();
-						if(historyIndex < 0){
-							historyIndex = commandHistory.length - 1;
-						}
-						else{
-							historyIndex--;
-							if(historyIndex == -1){
-								historyIndex = 0;
-							}
-						}
-						$("#stdin").text(commandHistory[historyIndex]);
-					}
-					else if(keyCode == 40){
-						// down arrow pressed
-						e.preventDefault();
-						if(historyIndex < commandHistory.length){
-							historyIndex++;
-						}
-						$("#stdin").text(commandHistory[historyIndex]);
-					}
-					else if((keyCode == 67 || keyCode == 99) && e.ctrlKey && !window.session_terminated){
-						if($("#stdin").text().slice(-1) == '_'){
-							// will replace '_' with '^C' at end of stdin
-							// TODO fix the case where the user typed '_' at the end of stdin
-							$("#stdin").text($("#stdin").text().slice(0, -1));
-							window.typingPassword = false;
-							$("#stdin").append('^C');
-						}
-						else{
-							$("#stdout").append('^C');
-						}
-						prepare_stdin();
-						window.setTimeout(function(){
-							window.commandCancelled = false;
-						}, 100);
-					}
-					else{
-						//alert(keyCode);
-					}
-				});
-				$(document).on("keypress", function(e){
-					if(!window.processing){
-						// shell is free to process the next command
-						var keyCode = e.which || e.keyCode || 0;
-						var stdin = $("#stdin").text();
-						stdin = stdin.substring(0, stdin.length - 1);
-						$("#stdin").text(stdin);
-						if(keyCode == 13){
-							// new command
-							if(window.typingPassword){
-								window.typingPassword = false;
-								if(!window.commandCancelled){
-									$("#wrong-password-box").html("incorrect password");
-								}
-								$("#wrong-password-box").removeAttr("id");
-								prepare_stdin();
-								return;
-							}
-							window.processing = true;
-							var input = $("#stdin").text();
-							commandHistory.push(input + "_");
-							historyIndex = -1;
-							var argv = input.split(/\s+/);
-							var argc = argv.length;
-							var inputCommand = argv[0];
-							if(inputCommand.charCodeAt(0) < 5){
-								// removes EOT left over from ctrl+c
-								inputCommand = inputCommand.substring(1, inputCommand.length);
-							}
-							if($.inArray(inputCommand, disallowedCommands) != -1){
-								// insufficeint privileges
-								// must use sudo
-								$("#stdout").html("insufficient privileges: requires root access");
-							}
-							else if($.inArray(inputCommand, supportedCommands) != -1){
-								switch(inputCommand){
-									case "cd":
-										// switch to directory
-										if(argc < 2){
-											$("#stdout").html("cd expects a directory");
-										}
-										else{
-											if(argv[1].length > 1 && argv[1].charAt([argv[1].length - 1]) == '/'){
-												argv[1] = argv[1].split("/").slice(0, -1).join("/");
-											}
-											else if(argv[1].length == 1 && argv[1].charAt([argv[1].length - 1]) == '/'){
-												pwd = "/";
-												path = [];
-												path[0] = filesystem;
-												window.processing = false;
-												prepare_stdin();
-												return;
-											}
-											var item = get_item(argv[1]);
-											if(item.type != "folder"){
-												$("#stdout").html("'" + argv[1] + "' is not a directory");
-												window.processing = false;
-												prepare_stdin();
-												return;
-											}
-											var temp_path = argv[1].split(/\//);
-											var i = 0;
-											if(argv[1].charAt(0) == '/'){
-												pwd = "/";
-												path = [];
-												path[0] = filesystem;
-												i++;
-												argv[1] = argv[1].substring(1, argv[1].length);
-											}
-											var ever = true;
-											for(ever; i < temp_path.length; i++){
-											//  ^ lolz
-												if(temp_path[i] == ".."){
-													if(pwd.split("/").length > 2){
-														pwd = pwd.split("/").slice(0, -1).join("/");
-														path = path.slice(0, -1);
-													}
-													else{
-														pwd = "/";
-														path = [];
-														path[0] = filesystem;
-													}
-												}
-												else{
-													var dir = (path.length >= 1) ? path[path.length - 1] : filesystem;
-													var child_index = get_child_index(dir, temp_path[i]);
-													if(child_index == -1){
-														if(pwd == "/"){
-															$("#stdout").html("'" + pwd + temp_path[i] + "' does not exist");
-														}
-														else{
-															$("#stdout").html("'" + pwd + "/" + temp_path[i] + "' does not exist");
-														}
-														i = temp_path.length;
-													}
-													else{
-														path.push(dir.children[child_index]);
-														if(pwd == "/"){
-															pwd += temp_path[i]; //dir.children[child_index].name;
-														}
-														else{
-															pwd += "/" + temp_path[i];
-														}
-													}
-												}
-											}
-										}
-									break;
-									case "clear":
-										$("#stdout").html("<div class=\"clear-block\"></div>");
-										$(".clear-block").innerHeight($(window).height());
-									break;
-									case "pwd":
-										// prints current directory
-										$("#stdout").html(pwd);
-									break;
-									case "ls":
-										// lists items in pwd
-										var ls_output = "";
-										var dir;
-										if(path.length > 1){
-											dir = path[path.length - 1];
-										}
-										else{
-											dir = filesystem;
-										}
-										for(var i = 0; i < dir.children.length; i++){
-											if(dir.children[i].type == "folder"){
-												ls_output += "<b>" + dir.children[i].name + "</b>&emsp;";
-											}
-											else{
-												ls_output += dir.children[i].name + "&emsp;";
-											}
-										}
-										$("#stdout").html(ls_output);
-									break;
-									case "cat":
-										// print out the specified file
-										if(argc < 2){
-											$("#stdout").html("cat expects a file");
-											break;
-										}
-										var item = get_item(argv[1]);
-										if(item){
-											if(item.type == "file"){
-												var address = window.location.href.split("/").slice(0, -2).join("/") + item.address;
-												$.ajax({
-													method: "post",
-													url: "fetch_html.php",
-													data: {
-														target_url: address
-													},
-													success: function(response){
-														$("#stdout").html(response);
-														window.setTimeout(function(){
-															prepare_stdin();
-														}, 100);
-														window.processing = false;
-														return;
-													}
-												});
-											}
-											else{
-												$("#stdout").html("'"+argv[1]+"' is not a file");
-											}
-										}
-										else{
-											$("#stdout").html("'"+argv[1] + "' does not exist");
-										}
-									break;
-									case "vi":
-									case "vim":
-										// opens the file for editing
-										$("#stdout").html("permission denied: write access required");
-									break;
-									case "open":
-										// open file in new tab
-										var item = get_item(argv[1]);
-										if(item){
-											var url = window.location.href.split("/").slice(0, -2).join("/") + item.address;
-											window.open(url);
-										}
-										else{
-											$("#stdout").html("'"+argv[1] + "' does not exist");
-										}
-									break;
-									case "exit":
-										// close the tab
-										$("#stdout").html("terminating session...<br /><br />session terminated");
-										window.session_terminated = true;
-										window.close();
-										return;
-									break;
-									case "help":
-										// prints help menu
-										$("#stdout").html("<div class=\"help-row\"><div class=\"help-item\">cd [dir]</div><div class=\"help-description\">Goes to the specified directory</div></div> <div class=\"help-row\"><div class=\"help-item\">pwd</div><div class=\"help-description\">Prints the path of the current directory</div></div> <div class=\"help-row\"><div class=\"help-item\">ls</div><div class=\"help-description\">Lists the items in the current directory</div></div> <div class=\"help-row\"><div class=\"help-item\">cat [file]</div><div class=\"help-description\">Lists the items in the current directory</div></div> <div class=\"help-row\"><div class=\"help-item\">vi [file]</div><div class=\"help-description\">Opens a file for editing</div></div> <div class=\"help-row\"><div class=\"help-item\">open [item]</div><div class=\"help-description\">Opens an item in the browser</div></div> <div class=\"help-row\"><div class=\"help-item\">help</div><div class=\"help-description\">Prints commands and options</div></div> <div class=\"help-row\"><div class=\"help-item\">sudo [command]</div><div class=\"help-description\">Executes the command as root</div></div><div class=\"help-row\"><div class=\"help-item\">exit</div><div class=\"help-description\">Exits the session</div></div><div class=\"help-item\">clear</div><div class=\"help-description\">Clears previous commands</div></div> <!--<div class=\"help-row\"><div class=\"help-item\"></div><div class=\"help-description\"></div></div> -->");
-									break;
-									case "sudo":
-									case "su":
-										// pretend to check for password
-										window.typingPassword = true;
-										$("#stdout").html("Password: <div id=\"wrong-password-box\"></div>");
-									break;
-									case "":
-										prepare_stdin();
-									break;
-									default:
-										$("#stdout").html(""+inputCommand+": command not found");
-									break;
-								}
-							}
-							else if(inputCommand == "" || window.commandCancelled){
-								//do nothing
-							}
-							else{
-								// unsuppoted command
-								$("#stdout").html(""+inputCommand+": command not found");
-							}
-							prepare_stdin();
-							if(window.typingPassword){
-								$("#ps1,#stdin,#stdout").hide();
-							}
-							window.processing = false;
-						}
-						else if(keyCode == 8){
-							// moved to keydown event for compatibility
-							// backspace key pressed
-							// $("#stdin").text($("#stdin").text().slice(0, -1));
-						}
-						else{
-							// write to #stdin
-							if(!window.typingPassword){
-								$("#stdin").append(String.fromCharCode(keyCode));
-								$("#stdin").append('_');
-							}
-						}
-					}
-				});
-			});
-		</script>
-	</head>
-	<body>
-		<input type="text" id="fake-input" style="position:fixed;bottom:-1000px;opacity:0.0;" />
-		<div id="shell-window" onclick="document.getElementById('fake-input').focus();">
-			Type 'help' for help
-			<div class="command-block">
-				<div class="ps1" id="ps1">
-					<!-- pwd -->
-					acm-utsa.org $
-				</div>
-				<div class="stdin" id="stdin"><!-- Standard Input -->_</div>
-				<div class="stdout" id="stdout">
-					<!-- Standard Output -->
-					
-				</div>
-			</div>
-		</div>
-	</body>
+    <head>
+        <?php
+            include('../common/google-analytics.php');
+        ?>
+        <style type="text/css">
+            body{
+                background-color: black;
+                color: green;
+                font-family: courier;
+                font-size:18px;
+            }
+            .command-block{
+                margin: 0px;
+                padding: 0px;
+            }
+            .ps1{
+                display:inline-block;
+            }
+            .stdin{
+                margin: 0px;
+                padding: 0px;
+                display:inline-block;
+            }
+            .stdout{
+                
+            }
+            .help-row{
+                display:block;
+            }
+            .help-item{
+                display:inline-block;
+                width:160px;
+                font-weight:bold;
+            }
+            .help-description{
+                display:inline-block;
+            }
+            #shell-window{
+                min-height:100%;
+                width:100%;
+            }
+        </style>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+        <script type="text/javascript">
+            var disallowedCommands = ["rm", "srm", "mkdir", "touch", "ftp", "ssh", "mv", "cp", "chmod", "chown", "mysql", "tar"];
+            // "su" || "sudo"
+            var supportedCommands = ["cd", "ls", "cat", "clear", "vi", "vim", "open", "exit", "help", "pwd", "sudo", "su"];
+            window.processing = false; // indicates whether a command is currently being processed
+            window.commandCancelled = false;
+            window.session_terminated = false;
+            // address of the current directory
+            var pwd = "/";
+            var path = [];
+            var commandHistory = [];
+            var historyIndex = -1;
+            // use the filesystem object to simulate the real filesystem
+            var filesystem = JSON.parse('{"type":"folder","name":"/","address":"/","children":[{"type":"file","name":"about.php","address":"/about.php"},{"type":"file","name":"calendar.php","address":"/calendar.php"},{"type":"file","name":"contact.php","address":"/contact.php"},{"type":"folder","name":"css","address":"/css","children":[{"type":"file","name":"index.css","address":"/css/index.css"},{"type":"file","name":"index.pyp","address":"/css/index.pyp"},{"type":"file","name":"master.css","address":"/css/master.css"}]},{"type":"file","name":"dues.php","address":"/dues.php"},{"type":"file","name":"favicon.ico","address":"/favicon.ico"},{"type":"file","name":"groups.php","address":"/groups.php"},{"type":"folder","name":"images","address":"/images","children":[{"type":"folder","name":"icons","address":"/images/icons","children":[{"type":"file","name":"add-to-slack.png","address":"/images/icons/add-to-slack.png"}]},{"type":"file","name":"logo-bordered.png","address":"/images/logo-bordered.png"},{"type":"file","name":"logo.png","address":"/images/logo.png"},{"type":"folder","name":"officer_photos","address":"/images/officer_photos","children":[{"type":"file","name":"andrew_bennett.jpg","address":"/images/officer_photos/andrew_bennett.jpg"},{"type":"file","name":"andrew_hutton.jpg","address":"/images/officer_photos/andrew_hutton.jpg"},{"type":"file","name":"andrew_sanetra.jpg","address":"/images/officer_photos/andrew_sanetra.jpg"},{"type":"file","name":"chris_doege.jpg","address":"/images/officer_photos/chris_doege.jpg"},{"type":"file","name":"default.jpg","address":"/images/officer_photos/default.jpg"},{"type":"file","name":"diego_romero.jpg","address":"/images/officer_photos/diego_romero.jpg"},{"type":"file","name":"jason_blig.jpg","address":"/images/officer_photos/jason_blig.jpg"},{"type":"file","name":"nishant_grover.jpg","address":"/images/officer_photos/nishant_grover.jpg"},{"type":"file","name":"shane_becker.jpg","address":"/images/officer_photos/shane_becker.jpg"}]}]},{"type":"file","name":"index.php","address":"/index.php"},{"type":"file","name":"join.php","address":"/join.php"},{"type":"file","name":"officers.php","address":"/officers.php"}]}');
+            path = [filesystem];
+            /*
+            var filesystem = JSON.parse('{
+                "type": "folder",
+                "name": "/",
+                "address": "/",
+                "children": [
+                    {
+                        "type": "file",
+                        "name": "about.php",
+                        "address": "/about.php"
+                    }, {
+                        "type": "file",
+                        "name": "calendar.php",
+                        "address": "/calendar.php"
+                    }, {
+                        "type": "file",
+                        "name": "contact.php",
+                        "address": "/contact.php"
+                    }, {
+                        "type": "folder",
+                        "name": "css",
+                        "address": "/css",
+                        "children": [
+                            {
+                                "type": "file",
+                                "name": "index.css",
+                                "address": "/css/index.css"
+                            }, {
+                                "type": "file",
+                                "name": "index.pyp",
+                                "address": "/css/index.pyp"
+                            }, {
+                                "type": "file",
+                                "name": "master.css",
+                                "address": "/css/master.css"
+                            }
+                        ]
+                    }, {
+                        "type": "file",
+                        "name": "dues.php",
+                        "address": "/dues.php"
+                    }, {
+                        "type": "file",
+                        "name": "favicon.ico",
+                        "address": "/favicon.ico"
+                    }, {
+                        "type": "file",
+                        "name": "groups.php",
+                        "address": "/groups.php"
+                    }, {
+                        "type": "folder",
+                        "name": "images",
+                        "address": "/images",
+                        "children": [
+                            {
+                                "type": "folder",
+                                "name": "icons",
+                                "address": "/images/icons",
+                                "children": [
+                                    {
+                                        "type": "file",
+                                        "name": "add-to-slack.png",
+                                        "address": "/images/icons/add-to-slack.png"
+                                    }
+                                ]
+                            }, {
+                                "type": "file",
+                                "name": "logo-bordered.png",
+                                "address": "/images/logo-bordered.png"
+                            }, {
+                                "type": "file",
+                                "name": "logo.png",
+                                "address": "/images/logo.png"
+                            }, {
+                                "type": "folder",
+                                "name": "officer_photos",
+                                "address": "/images/officer_photos",
+                                "children": [
+                                    {
+                                        "type": "file",
+                                        "name": "andrew_bennett.jpg",
+                                        "address": "/images/officer_photos/andrew_bennett.jpg"
+                                    }, {
+                                        "type": "file",
+                                        "name": "andrew_hutton.jpg",
+                                        "address": "/images/officer_photos/andrew_hutton.jpg"
+                                    }, {
+                                        "type": "file",
+                                        "name": "andrew_sanetra.jpg",
+                                        "address": "/images/officer_photos/andrew_sanetra.jpg"
+                                    }, {
+                                        "type": "file",
+                                        "name": "chris_doege.jpg",
+                                        "address": "/images/officer_photos/chris_doege.jpg"
+                                    }, {
+                                        "type": "file",
+                                        "name": "default.jpg",
+                                        "address": "/images/officer_photos/default.jpg"
+                                    }, {
+                                        "type": "file",
+                                        "name": "diego_romero.jpg",
+                                        "address": "/images/officer_photos/diego_romero.jpg"
+                                    }, {
+                                        "type": "file",
+                                        "name": "jason_blig.jpg",
+                                        "address": "/images/officer_photos/jason_blig.jpg"
+                                    }, {
+                                        "type": "file",
+                                        "name": "nishant_grover.jpg",
+                                        "address": "/images/officer_photos/nishant_grover.jpg"
+                                    }, {
+                                        "type": "file",
+                                        "name": "shane_becker.jpg",
+                                        "address": "/images/officer_photos/shane_becker.jpg"
+                                    }
+                                ]
+                            }
+                        ]
+                    }, {
+                        "type": "file",
+                        "name": "index.php",
+                        "address": "/index.php"
+                    }, {
+                        "type": "file",
+                        "name": "join.php",
+                        "address": "/join.php"
+                    }, {
+                        "type": "file",
+                        "name": "officers.php",
+                        "address": "/officers.php"
+                    }
+                ]
+            }');
+            */
+            
+            function get_child_index(parentDir, childName){
+                for(var i = 0; i < parentDir.children.length; i++){
+                    if(parentDir.children[i].name == childName){
+                        return i;
+                    }
+                }
+                return -1;
+            }
+            
+            function get_item(relative_path){
+                var i = 0;
+                var pwd_copy = pwd;
+                var path_copy = JSON.parse(JSON.stringify(path));
+                if(relative_path.charAt(relative_path.length - 1) == '/'){
+                    relative_path = relative_path.split("/").slice(0, -1).join("/");
+                }
+                var temp_path = relative_path.split(/\//);
+                if(relative_path.charAt(0) == '/'){
+                    pwd_copy = "/";
+                    path_copy = [];
+                    path_copy[0] = filesystem;
+                    temp_path.shift();
+                }
+                var ever = true;
+                for(ever; i < temp_path.length; i++){
+                //  ^ lolz
+                    if(temp_path[i] == ".."){
+                        if(pwd_copy.split("/").length > 2){
+                            pwd_copy = pwd_copy.split("/").slice(0, -1).join("/");
+                            path_copy = path_copy.slice(0, -1);
+                        }
+                        else{
+                            pwd_copy = "/";
+                            path_copy = [];
+                            path_copy[0] = filesystem;
+                        }
+                    }
+                    else{
+                        var dir = (path_copy.length > 1) ? path_copy[path_copy.length - 1] : filesystem;
+                        var child_index = get_child_index(dir, temp_path[i]);
+                        if(child_index == -1){
+                            if(pwd_copy == "/"){
+                                $("#stdout").html("'" + pwd_copy + temp_path[i] + "' does not exist");
+                            }
+                            else{
+                                $("#stdout").html("'" + pwd_copy + "/" + temp_path[i] + "' does not exist");
+                            }
+                            i = path_copy.length;
+                        }
+                        else{
+                            path_copy.push(dir.children[child_index]);
+                            if(pwd_copy == "/"){
+                                pwd_copy += temp_path[i]; //dir.children[child_index].name;
+                            }
+                            else{
+                                pwd_copy += "/" + temp_path[i];
+                            }
+                        }
+                    }
+                }
+                return path_copy[path_copy.length - 1];
+            }
+            
+            function prepare_stdin(){
+                $("#ps1").removeAttr("id");
+                $("#stdin").removeAttr("id");
+                $("#stdout").removeAttr("id");
+                $("#shell-window").append("<div class=\"command-block\"><div class=\"ps1\" id=\"ps1\">acm-utsa.org $&nbsp;</div><div class=\"stdin\" id=\"stdin\">_</div><div class=\"stdout\" id=\"stdout\"></div></div>");
+                $("html, body").scrollTop($(document).height());
+            }
+            
+            $(document).ready(function(){
+                $(window).resize(function(){
+                    $(".clear-block").height($(window).height());
+                });
+                document.getElementById('fake-input').focus();
+                $("#fake-input").on("keydown", function(e){
+                    var keyCode = e.which || e.keyCode || 0;
+                    if(keyCode == 8){
+                        // backspace key pressed
+                        $("#stdin").text($("#stdin").text().slice(0, -2));
+                        window.setTimeout(function(){
+                            $("#stdin").append('_');
+                        }, 0);
+                    }
+                });
+                $(document).on("keydown", function(e){
+                    var keyCode = e.which || e.keyCode || 0;
+                    window.commandCancelled = (keyCode == 67 || keyCode == 99) && e.ctrlKey;
+                    if(keyCode == 38){
+                        // up arrow pressed
+                        e.preventDefault();
+                        if(historyIndex < 0){
+                            historyIndex = commandHistory.length - 1;
+                        }
+                        else{
+                            historyIndex--;
+                            if(historyIndex == -1){
+                                historyIndex = 0;
+                            }
+                        }
+                        $("#stdin").text(commandHistory[historyIndex]);
+                    }
+                    else if(keyCode == 40){
+                        // down arrow pressed
+                        e.preventDefault();
+                        if(historyIndex < commandHistory.length){
+                            historyIndex++;
+                        }
+                        $("#stdin").text(commandHistory[historyIndex]);
+                    }
+                    else if((keyCode == 67 || keyCode == 99) && e.ctrlKey && !window.session_terminated){
+                        if($("#stdin").text().slice(-1) == '_'){
+                            // will replace '_' with '^C' at end of stdin
+                            // TODO fix the case where the user typed '_' at the end of stdin
+                            $("#stdin").text($("#stdin").text().slice(0, -1));
+                            window.typingPassword = false;
+                            $("#stdin").append('^C');
+                        }
+                        else{
+                            $("#stdout").append('^C');
+                        }
+                        prepare_stdin();
+                        window.setTimeout(function(){
+                            window.commandCancelled = false;
+                        }, 100);
+                    }
+                    else{
+                        //alert(keyCode);
+                    }
+                });
+                $(document).on("keypress", function(e){
+                    if(!window.processing){
+                        // shell is free to process the next command
+                        var keyCode = e.which || e.keyCode || 0;
+                        var stdin = $("#stdin").text();
+                        stdin = stdin.substring(0, stdin.length - 1);
+                        $("#stdin").text(stdin);
+                        if(keyCode == 13){
+                            // new command
+                            if(window.typingPassword){
+                                window.typingPassword = false;
+                                if(!window.commandCancelled){
+                                    $("#wrong-password-box").html("incorrect password");
+                                }
+                                $("#wrong-password-box").removeAttr("id");
+                                prepare_stdin();
+                                return;
+                            }
+                            window.processing = true;
+                            var input = $("#stdin").text();
+                            commandHistory.push(input + "_");
+                            historyIndex = -1;
+                            var argv = input.split(/\s+/);
+                            var argc = argv.length;
+                            var inputCommand = argv[0];
+                            if(inputCommand.charCodeAt(0) < 5){
+                                // removes EOT left over from ctrl+c
+                                inputCommand = inputCommand.substring(1, inputCommand.length);
+                            }
+                            if($.inArray(inputCommand, disallowedCommands) != -1){
+                                // insufficeint privileges
+                                // must use sudo
+                                $("#stdout").html("insufficient privileges: requires root access");
+                            }
+                            else if($.inArray(inputCommand, supportedCommands) != -1){
+                                switch(inputCommand){
+                                    case "cd":
+                                        // switch to directory
+                                        if(argc < 2){
+                                            $("#stdout").html("cd expects a directory");
+                                        }
+                                        else{
+                                            if(argv[1].length > 1 && argv[1].charAt([argv[1].length - 1]) == '/'){
+                                                argv[1] = argv[1].split("/").slice(0, -1).join("/");
+                                            }
+                                            else if(argv[1].length == 1 && argv[1].charAt([argv[1].length - 1]) == '/'){
+                                                pwd = "/";
+                                                path = [];
+                                                path[0] = filesystem;
+                                                window.processing = false;
+                                                prepare_stdin();
+                                                return;
+                                            }
+                                            var item = get_item(argv[1]);
+                                            if(item.type != "folder"){
+                                                $("#stdout").html("'" + argv[1] + "' is not a directory");
+                                                window.processing = false;
+                                                prepare_stdin();
+                                                return;
+                                            }
+                                            var temp_path = argv[1].split(/\//);
+                                            var i = 0;
+                                            if(argv[1].charAt(0) == '/'){
+                                                pwd = "/";
+                                                path = [];
+                                                path[0] = filesystem;
+                                                i++;
+                                                argv[1] = argv[1].substring(1, argv[1].length);
+                                            }
+                                            var ever = true;
+                                            for(ever; i < temp_path.length; i++){
+                                            //  ^ lolz
+                                                if(temp_path[i] == ".."){
+                                                    if(pwd.split("/").length > 2){
+                                                        pwd = pwd.split("/").slice(0, -1).join("/");
+                                                        path = path.slice(0, -1);
+                                                    }
+                                                    else{
+                                                        pwd = "/";
+                                                        path = [];
+                                                        path[0] = filesystem;
+                                                    }
+                                                }
+                                                else{
+                                                    var dir = (path.length >= 1) ? path[path.length - 1] : filesystem;
+                                                    var child_index = get_child_index(dir, temp_path[i]);
+                                                    if(child_index == -1){
+                                                        if(pwd == "/"){
+                                                            $("#stdout").html("'" + pwd + temp_path[i] + "' does not exist");
+                                                        }
+                                                        else{
+                                                            $("#stdout").html("'" + pwd + "/" + temp_path[i] + "' does not exist");
+                                                        }
+                                                        i = temp_path.length;
+                                                    }
+                                                    else{
+                                                        path.push(dir.children[child_index]);
+                                                        if(pwd == "/"){
+                                                            pwd += temp_path[i]; //dir.children[child_index].name;
+                                                        }
+                                                        else{
+                                                            pwd += "/" + temp_path[i];
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    break;
+                                    case "clear":
+                                        $("#stdout").html("<div class=\"clear-block\"></div>");
+                                        $(".clear-block").innerHeight($(window).height());
+                                    break;
+                                    case "pwd":
+                                        // prints current directory
+                                        $("#stdout").html(pwd);
+                                    break;
+                                    case "ls":
+                                        // lists items in pwd
+                                        var ls_output = "";
+                                        var dir;
+                                        if(path.length > 1){
+                                            dir = path[path.length - 1];
+                                        }
+                                        else{
+                                            dir = filesystem;
+                                        }
+                                        for(var i = 0; i < dir.children.length; i++){
+                                            if(dir.children[i].type == "folder"){
+                                                ls_output += "<b>" + dir.children[i].name + "</b>&emsp;";
+                                            }
+                                            else{
+                                                ls_output += dir.children[i].name + "&emsp;";
+                                            }
+                                        }
+                                        $("#stdout").html(ls_output);
+                                    break;
+                                    case "cat":
+                                        // print out the specified file
+                                        if(argc < 2){
+                                            $("#stdout").html("cat expects a file");
+                                            break;
+                                        }
+                                        var item = get_item(argv[1]);
+                                        if(item){
+                                            if(item.type == "file"){
+                                                var address = window.location.href.split("/").slice(0, -2).join("/") + item.address;
+                                                $.ajax({
+                                                    method: "post",
+                                                    url: "fetch_html.php",
+                                                    data: {
+                                                        target_url: address
+                                                    },
+                                                    success: function(response){
+                                                        $("#stdout").html(response);
+                                                        window.setTimeout(function(){
+                                                            prepare_stdin();
+                                                        }, 100);
+                                                        window.processing = false;
+                                                        return;
+                                                    }
+                                                });
+                                            }
+                                            else{
+                                                $("#stdout").html("'"+argv[1]+"' is not a file");
+                                            }
+                                        }
+                                        else{
+                                            $("#stdout").html("'"+argv[1] + "' does not exist");
+                                        }
+                                    break;
+                                    case "vi":
+                                    case "vim":
+                                        // opens the file for editing
+                                        $("#stdout").html("permission denied: write access required");
+                                    break;
+                                    case "open":
+                                        // open file in new tab
+                                        var item = get_item(argv[1]);
+                                        if(item){
+                                            var url = window.location.href.split("/").slice(0, -2).join("/") + item.address;
+                                            window.open(url);
+                                        }
+                                        else{
+                                            $("#stdout").html("'"+argv[1] + "' does not exist");
+                                        }
+                                    break;
+                                    case "exit":
+                                        // close the tab
+                                        $("#stdout").html("terminating session...<br /><br />session terminated");
+                                        window.session_terminated = true;
+                                        window.close();
+                                        return;
+                                    break;
+                                    case "help":
+                                        // prints help menu
+                                        $("#stdout").html("<div class=\"help-row\"><div class=\"help-item\">cd [dir]</div><div class=\"help-description\">Goes to the specified directory</div></div> <div class=\"help-row\"><div class=\"help-item\">pwd</div><div class=\"help-description\">Prints the path of the current directory</div></div> <div class=\"help-row\"><div class=\"help-item\">ls</div><div class=\"help-description\">Lists the items in the current directory</div></div> <div class=\"help-row\"><div class=\"help-item\">cat [file]</div><div class=\"help-description\">Lists the items in the current directory</div></div> <div class=\"help-row\"><div class=\"help-item\">vi [file]</div><div class=\"help-description\">Opens a file for editing</div></div> <div class=\"help-row\"><div class=\"help-item\">open [item]</div><div class=\"help-description\">Opens an item in the browser</div></div> <div class=\"help-row\"><div class=\"help-item\">help</div><div class=\"help-description\">Prints commands and options</div></div> <div class=\"help-row\"><div class=\"help-item\">sudo [command]</div><div class=\"help-description\">Executes the command as root</div></div><div class=\"help-row\"><div class=\"help-item\">exit</div><div class=\"help-description\">Exits the session</div></div><div class=\"help-item\">clear</div><div class=\"help-description\">Clears previous commands</div></div> <!--<div class=\"help-row\"><div class=\"help-item\"></div><div class=\"help-description\"></div></div> -->");
+                                    break;
+                                    case "sudo":
+                                    case "su":
+                                        // pretend to check for password
+                                        window.typingPassword = true;
+                                        $("#stdout").html("Password: <div id=\"wrong-password-box\"></div>");
+                                    break;
+                                    case "":
+                                        prepare_stdin();
+                                    break;
+                                    default:
+                                        $("#stdout").html(""+inputCommand+": command not found");
+                                    break;
+                                }
+                            }
+                            else if(inputCommand == "" || window.commandCancelled){
+                                //do nothing
+                            }
+                            else{
+                                // unsuppoted command
+                                $("#stdout").html(""+inputCommand+": command not found");
+                            }
+                            prepare_stdin();
+                            if(window.typingPassword){
+                                $("#ps1,#stdin,#stdout").hide();
+                            }
+                            window.processing = false;
+                        }
+                        else if(keyCode == 8){
+                            // moved to keydown event for compatibility
+                            // backspace key pressed
+                            // $("#stdin").text($("#stdin").text().slice(0, -1));
+                        }
+                        else{
+                            // write to #stdin
+                            if(!window.typingPassword){
+                                $("#stdin").append(String.fromCharCode(keyCode));
+                                $("#stdin").append('_');
+                            }
+                        }
+                    }
+                });
+            });
+        </script>
+    </head>
+    <body>
+        <input type="text" id="fake-input" style="position:fixed;bottom:-1000px;opacity:0.0;" />
+        <div id="shell-window" onclick="document.getElementById('fake-input').focus();">
+            Type 'help' for help
+            <div class="command-block">
+                <div class="ps1" id="ps1">
+                    <!-- pwd -->
+                    acm-utsa.org $
+                </div>
+                <div class="stdin" id="stdin"><!-- Standard Input -->_</div>
+                <div class="stdout" id="stdout">
+                    <!-- Standard Output -->
+                    
+                </div>
+            </div>
+        </div>
+    </body>
 </html>
\ No newline at end of file
diff --git a/tools/asap.py b/tools/asap.py
index 35bf7bd..67656a9 100644
--- a/tools/asap.py
+++ b/tools/asap.py
@@ -3,52 +3,52 @@
 import mechanize, re, time, sys
 
 def add_time(time, days, schedule, people):
-	""" Adds to a master schedule dict given a class meeting time
-	
-	The schedule dict is a two-dimensional dict with the following
-	structure:
-
-	schedule[day of week][time segment] -> # of people enrolled
-
-	This function reads in a time string, days string, and the number
-	of people enrolled in the class associated with the time info, and
-	adds them to the master schedule list.
-
-	Args:
-		time: the meeting time of the class (e.g. 4:00-5:15pm)
-		days: the days that the class meets (e.g. MWF, TR)
-			the days are represented by single uppercase
-			characters, like so:
-			Monday => M, Tuesday => T, Wednesday => W, 
-			Thursday => R, Friday => F
-		schedule: the pre-built schedule dict
-		people: the number of people enrolled in the class
-
-	Returns:
-	"""
-	# We need to know if the time is AM or PM
-	if 'pm' in time >= 0: ispm = True
-	else: ispm = False
-
-	split = time[:-2].split('-')
-	start = split[0]
-	end = split[1]
-
-	start = start.split(':')
-	end = end.split(':')
-
-	start = int(start[0]) * 100 + int(start[1])
-	end = int(end[0]) * 100 + int(end[1])
-
-	if ispm and end < 1200:
-		start += 1200
-		end += 1200
-
-	for day in schedule:
-		if day in days:
-			for key in schedule[day]:
-				if key >= start and key < end:
-					schedule[day][key] += int(people)
+    """ Adds to a master schedule dict given a class meeting time
+    
+    The schedule dict is a two-dimensional dict with the following
+    structure:
+
+    schedule[day of week][time segment] -> # of people enrolled
+
+    This function reads in a time string, days string, and the number
+    of people enrolled in the class associated with the time info, and
+    adds them to the master schedule list.
+
+    Args:
+        time: the meeting time of the class (e.g. 4:00-5:15pm)
+        days: the days that the class meets (e.g. MWF, TR)
+            the days are represented by single uppercase
+            characters, like so:
+            Monday => M, Tuesday => T, Wednesday => W, 
+            Thursday => R, Friday => F
+        schedule: the pre-built schedule dict
+        people: the number of people enrolled in the class
+
+    Returns:
+    """
+    # We need to know if the time is AM or PM
+    if 'pm' in time >= 0: ispm = True
+    else: ispm = False
+
+    split = time[:-2].split('-')
+    start = split[0]
+    end = split[1]
+
+    start = start.split(':')
+    end = end.split(':')
+
+    start = int(start[0]) * 100 + int(start[1])
+    end = int(end[0]) * 100 + int(end[1])
+
+    if ispm and end < 1200:
+        start += 1200
+        end += 1200
+
+    for day in schedule:
+        if day in days:
+            for key in schedule[day]:
+                if key >= start and key < end:
+                    schedule[day][key] += int(people)
 
 # URL of the asap view schedule page
 url_asap = 'https://asap.utsa.edu/pls/prod/xwskschd.P_UTSA_OpenSch'
@@ -74,68 +74,68 @@ def add_time(time, days, schedule, people):
 # Build initial schedule dict (see add_time())
 schedule = {}
 for s in ['M', 'T', 'W', 'R', 'F']:
-	schedule[s] = {}
-	for i in range(24):
-		for j in range(0, 60, 15):
-			schedule[s][i * 100 + j] = 0
+    schedule[s] = {}
+    for i in range(24):
+        for j in range(0, 60, 15):
+            schedule[s][i * 100 + j] = 0
 
 for row in rows:
-	if row.strip().startswith('<TD ALIGN="left"'):
-		# Read TD elements into a list
-		if row.find('>TBA<') < row.find('Main Camp'): continue
-		cells = row.split('</TD>')
-		try:
-			# Parse subject
-			m = re.search('SMALL>(\w+)</SMALL', cells[1])
-			subj = m.group(1)
-			if subj != 'CS': continue
-			# Parse course number
-			m = re.search('>(\d+)<', cells[2])
-			course = m.group(1)
-			if int(course) > 4999 or int(course) < 1083 or int(course) == 1173: continue
-			# Parse days
-			m = re.search('SMALL>(.*)</SMALL', cells[7])
-			days = m.group(1)
-			# Parse time
-			m = re.search('SMALL>(.*)</SMALL', cells[8])
-			timev = m.group(1)
-			# Parse # of enrolled
-			m = re.search('>(\d+)<', cells[15])
-			enr = m.group(1)
-			add_time(timev, days, schedule, enr)
-		except AttributeError:
-			continue
+    if row.strip().startswith('<TD ALIGN="left"'):
+        # Read TD elements into a list
+        if row.find('>TBA<') < row.find('Main Camp'): continue
+        cells = row.split('</TD>')
+        try:
+            # Parse subject
+            m = re.search('SMALL>(\w+)</SMALL', cells[1])
+            subj = m.group(1)
+            if subj != 'CS': continue
+            # Parse course number
+            m = re.search('>(\d+)<', cells[2])
+            course = m.group(1)
+            if int(course) > 4999 or int(course) < 1083 or int(course) == 1173: continue
+            # Parse days
+            m = re.search('SMALL>(.*)</SMALL', cells[7])
+            days = m.group(1)
+            # Parse time
+            m = re.search('SMALL>(.*)</SMALL', cells[8])
+            timev = m.group(1)
+            # Parse # of enrolled
+            m = re.search('>(\d+)<', cells[15])
+            enr = m.group(1)
+            add_time(timev, days, schedule, enr)
+        except AttributeError:
+            continue
 
 # Prints a proper HTML table with all data
 print '<table><thead><tr>'
 
 # Print top row
 for day in ['', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday']:
-	print '<th>'
-	print day
-	print '</th>'
+    print '<th>'
+    print day
+    print '</th>'
 print '</thead><tbody>'
 
 # Print remaining rows, from 8:00am to (exclusive) 10:00pm
 for i in range(8, 22):
-	for j in range(0, 60, 15):
-		time = str(i * 100 + j)
-		if len(time) == 1:
-			timep = time + ":00"
-		elif len(time) < 3:
-			timep = "0:" + time
-		elif len(time) == 3:
-			timep = time[0:1] + ":" + time[1:3]
-		else:
-			timep = time[0:2] + ":" + time[2:4]
-		# Print a row
-		print '<tr>'
-		# Print time cell
-		print '<td>' + timep + '</td>'
-		time = int(time)
-		# Print remaining cells for that time
-		for day in ['M', 'T', 'W', 'R', 'F']:
-			print '<td>' + str(schedule[day][time]) + '</td>'
-		print '</tr>'
+    for j in range(0, 60, 15):
+        time = str(i * 100 + j)
+        if len(time) == 1:
+            timep = time + ":00"
+        elif len(time) < 3:
+            timep = "0:" + time
+        elif len(time) == 3:
+            timep = time[0:1] + ":" + time[1:3]
+        else:
+            timep = time[0:2] + ":" + time[2:4]
+        # Print a row
+        print '<tr>'
+        # Print time cell
+        print '<td>' + timep + '</td>'
+        time = int(time)
+        # Print remaining cells for that time
+        for day in ['M', 'T', 'W', 'R', 'F']:
+            print '<td>' + str(schedule[day][time]) + '</td>'
+        print '</tr>'
 
 print '</tbody></table>'
diff --git a/tools/pypros.py b/tools/pypros.py
index 243daef..a1f8013 100644
--- a/tools/pypros.py
+++ b/tools/pypros.py
@@ -3,223 +3,223 @@
 import pprint
 
 def stack_string(stack):
-	out = ""
-	for i in stack:
-		out += i.lstrip().rstrip() + ' '
-	return out
+    out = ""
+    for i in stack:
+        out += i.lstrip().rstrip() + ' '
+    return out
 
 
 def indent_string(levels):
-	out = ""
-	for i in levels:
-		out += i
-	return out
+    out = ""
+    for i in levels:
+        out += i
+    return out
 
 def check_indent(levels, line):
-	indent = line[:line.find(line.lstrip())]
-	return indent == indent_string(levels)
+    indent = line[:line.find(line.lstrip())]
+    return indent == indent_string(levels)
 
 def build(filename):
 
-	f = open(filename, 'r')
+    f = open(filename, 'r')
 
 
-	output = {0:{}}
-	indent_level = ['']
-	selector_stack = deque()
-	depth_inc = False
-	encounter = 0
-	key = 0
-
-	for line in f:
-		if not line.isspace():
-
-			if check_indent(indent_level, line) and not depth_inc:
-				if line.find(';') == -1:
-					selector_stack.append(line.rstrip().lstrip())
-					selector = stack_string(selector_stack)
-					if selector not in output[key]:
-						output[key][stack_string(selector_stack)] = [encounter, []]
-						encounter += 1
-
-					depth_inc = True
-					if line.find('@') != -1:
-						if selector in output[0]:
-							del output[0][selector]
-						selector_stack.pop()
-
-						key = line.lstrip().rstrip()
-						output[key] = {}
-						depth_inc = True
-				else:
-					output[key][stack_string(selector_stack)][1].append(line.rstrip().lstrip())
-			else:
-
-				indent = line[:line.find(line.lstrip())]
-				if depth_inc and len(indent_string(indent_level)) >= len(indent):
-
-					selector_stack.pop()
-
-					if line.find(';') == -1:
-						selector_stack.append(line.rstrip().lstrip())
-						selector = stack_string(selector_stack)
-						if selector not in output[key]:
-							output[key][stack_string(selector_stack)] = [encounter, []]
-							encounter += 1
-						depth_inc = True
-						if line.find('@') != -1:
-							if selector in output[0]:
-								del output[0][selector]
-
-
-							key = line.lstrip().rstrip()
-							output[key] = {}
-							depth_inc = True
-					else:
-						depth_inc = False
-				elif depth_inc and len(indent_string(indent_level)) < len(indent):
-
-					if line.find(';') == -1:
-						selector_stack.append(line.rstrip().lstrip())
-						selector = stack_string(selector_stack)
-						if selector not in output[key]:
-							output[key][stack_string(selector_stack)] = [encounter, []]
-							encounter += 1
-
-						added_indent = indent[len(indent_string(indent_level)):]
-
-						indent_level.append(added_indent)
-
-						depth_inc = True
-						if line.find('@') != -1:
-
-							if selector in output[0]:
-								del output[0][selector]
-
-							selector_stack.pop()
-							key = line.lstrip().rstrip()
-							output[key] = {}
-							depth_inc = True
-					else:
-						added_indent = indent[len(indent_string(indent_level)):]
-
-						indent_level.append(added_indent)
-						output[key][stack_string(selector_stack)][1].append(line.rstrip().lstrip())
-						depth_inc = False
-				elif depth_inc:
-
-
-					selector_stack.pop()
-					depth_inc = False
-
-
-				else:
-
-					while indent_string(indent_level) != indent:
-						if indent_string(indent_level) == '':
-							break
-
-						indent_level.pop()
-						if len(selector_stack) > 0:
-							selector_stack.pop()
-					if indent_string(indent_level) == '':
-
-						indent_level = ['']
-						selector_stack = deque()
-						depth_inc = False
-						key = 0
-					if line.find(';') == -1:
-						selector_stack.append(line.rstrip().lstrip())
-						selector = stack_string(selector_stack)
-						if selector not in output[key]:
-							output[key][stack_string(selector_stack)] = [encounter, []]
-							encounter += 1
-
-						depth_inc = True
-						if line.find('@') != -1:
-
-							if selector in output[0]:
-								del output[0][selector]
-							selector_stack.pop()
-							key = line.lstrip().rstrip()
-							output[key] = {}
-							depth_inc = True
-					else:
-						output[key][stack_string(selector_stack)][1].append(line.rstrip().lstrip())
-
-	f.close()
-	return output
+    output = {0:{}}
+    indent_level = ['']
+    selector_stack = deque()
+    depth_inc = False
+    encounter = 0
+    key = 0
+
+    for line in f:
+        if not line.isspace():
+
+            if check_indent(indent_level, line) and not depth_inc:
+                if line.find(';') == -1:
+                    selector_stack.append(line.rstrip().lstrip())
+                    selector = stack_string(selector_stack)
+                    if selector not in output[key]:
+                        output[key][stack_string(selector_stack)] = [encounter, []]
+                        encounter += 1
+
+                    depth_inc = True
+                    if line.find('@') != -1:
+                        if selector in output[0]:
+                            del output[0][selector]
+                        selector_stack.pop()
+
+                        key = line.lstrip().rstrip()
+                        output[key] = {}
+                        depth_inc = True
+                else:
+                    output[key][stack_string(selector_stack)][1].append(line.rstrip().lstrip())
+            else:
+
+                indent = line[:line.find(line.lstrip())]
+                if depth_inc and len(indent_string(indent_level)) >= len(indent):
+
+                    selector_stack.pop()
+
+                    if line.find(';') == -1:
+                        selector_stack.append(line.rstrip().lstrip())
+                        selector = stack_string(selector_stack)
+                        if selector not in output[key]:
+                            output[key][stack_string(selector_stack)] = [encounter, []]
+                            encounter += 1
+                        depth_inc = True
+                        if line.find('@') != -1:
+                            if selector in output[0]:
+                                del output[0][selector]
+
+
+                            key = line.lstrip().rstrip()
+                            output[key] = {}
+                            depth_inc = True
+                    else:
+                        depth_inc = False
+                elif depth_inc and len(indent_string(indent_level)) < len(indent):
+
+                    if line.find(';') == -1:
+                        selector_stack.append(line.rstrip().lstrip())
+                        selector = stack_string(selector_stack)
+                        if selector not in output[key]:
+                            output[key][stack_string(selector_stack)] = [encounter, []]
+                            encounter += 1
+
+                        added_indent = indent[len(indent_string(indent_level)):]
+
+                        indent_level.append(added_indent)
+
+                        depth_inc = True
+                        if line.find('@') != -1:
+
+                            if selector in output[0]:
+                                del output[0][selector]
+
+                            selector_stack.pop()
+                            key = line.lstrip().rstrip()
+                            output[key] = {}
+                            depth_inc = True
+                    else:
+                        added_indent = indent[len(indent_string(indent_level)):]
+
+                        indent_level.append(added_indent)
+                        output[key][stack_string(selector_stack)][1].append(line.rstrip().lstrip())
+                        depth_inc = False
+                elif depth_inc:
+
+
+                    selector_stack.pop()
+                    depth_inc = False
+
+
+                else:
+
+                    while indent_string(indent_level) != indent:
+                        if indent_string(indent_level) == '':
+                            break
+
+                        indent_level.pop()
+                        if len(selector_stack) > 0:
+                            selector_stack.pop()
+                    if indent_string(indent_level) == '':
+
+                        indent_level = ['']
+                        selector_stack = deque()
+                        depth_inc = False
+                        key = 0
+                    if line.find(';') == -1:
+                        selector_stack.append(line.rstrip().lstrip())
+                        selector = stack_string(selector_stack)
+                        if selector not in output[key]:
+                            output[key][stack_string(selector_stack)] = [encounter, []]
+                            encounter += 1
+
+                        depth_inc = True
+                        if line.find('@') != -1:
+
+                            if selector in output[0]:
+                                del output[0][selector]
+                            selector_stack.pop()
+                            key = line.lstrip().rstrip()
+                            output[key] = {}
+                            depth_inc = True
+                    else:
+                        output[key][stack_string(selector_stack)][1].append(line.rstrip().lstrip())
+
+    f.close()
+    return output
 
 def write(filename, data):
 
-	f = open(filename, 'w')
-	out = ''
-	#pprint.pprint(data)
-
-	for key in data.keys():
-		tab = ''
-		if key != 0:
-			tab = '\t'
-			out += key + " {\n"
-		keys = sorted(data[key].items(), key=operator.itemgetter(1))
-		for selector, _ in keys:
-			sel = selector.replace(' &', '')
-			out += tab + sel + '{\n'
-			for i in data[key][selector][1]:
-
-				out += tab + '\t' + i.lstrip().rstrip() + '\n'
-			out += tab + '}\n\n'
-		if key != 0:
-			out += '}\n'
-
-	f.write(out)
-	f.close()
+    f = open(filename, 'w')
+    out = ''
+    #pprint.pprint(data)
+
+    for key in data.keys():
+        tab = ''
+        if key != 0:
+            tab = '\t'
+            out += key + " {\n"
+        keys = sorted(data[key].items(), key=operator.itemgetter(1))
+        for selector, _ in keys:
+            sel = selector.replace(' &', '')
+            out += tab + sel + '{\n'
+            for i in data[key][selector][1]:
+
+                out += tab + '\t' + i.lstrip().rstrip() + '\n'
+            out += tab + '}\n\n'
+        if key != 0:
+            out += '}\n'
+
+    f.write(out)
+    f.close()
 
 def process(filename):
-	print('Processing', filename+'...')
-	css_file = filename+'.css' if not filename.endswith('.pyp') else filename[:filename.index('.pyp')]+'.css'
-	pyp_file = filename+'.pyp' if not filename.endswith('.pyp') else filename
-	write(css_file, build(pyp_file))
+    print('Processing', filename+'...')
+    css_file = filename+'.css' if not filename.endswith('.pyp') else filename[:filename.index('.pyp')]+'.css'
+    pyp_file = filename+'.pyp' if not filename.endswith('.pyp') else filename
+    write(css_file, build(pyp_file))
 
 if __name__ == '__main__':
 
-	watched = {}
-	watch = False
-
-	for arg in sys.argv[1:]:
-		if arg.startswith('-'):
-			flags = arg[1:].split()
-			for flag in flags:
-				if flag == 'w':
-					watch = True
-		else:
-			if watch:
-				key = arg if arg.endswith('.pyp') else arg + '.pyp'
-				f = open(key, 'rb')
-				hash_obj = hashlib.md5()
-				hash_obj.update(f.read())
-				digest = hash_obj.hexdigest()
-				watched[key] = digest
-
-				f.close()
-			process(arg)
-
-	while watch:
-
-		for filename in watched:
-			name = filename if filename.endswith('.pyp') else filename + '.pyp'
-			f = open(name, 'rb')
-			data = f.read()
-			f.close()
-			hash_obj = hashlib.md5()
-			hash_obj.update(data)
-			digest = hash_obj.hexdigest()
-			if watched[name] != digest:
-
-				process(name)
-				watched[name] = digest
-
-		time.sleep(1)
+    watched = {}
+    watch = False
+
+    for arg in sys.argv[1:]:
+        if arg.startswith('-'):
+            flags = arg[1:].split()
+            for flag in flags:
+                if flag == 'w':
+                    watch = True
+        else:
+            if watch:
+                key = arg if arg.endswith('.pyp') else arg + '.pyp'
+                f = open(key, 'rb')
+                hash_obj = hashlib.md5()
+                hash_obj.update(f.read())
+                digest = hash_obj.hexdigest()
+                watched[key] = digest
+
+                f.close()
+            process(arg)
+
+    while watch:
+
+        for filename in watched:
+            name = filename if filename.endswith('.pyp') else filename + '.pyp'
+            f = open(name, 'rb')
+            data = f.read()
+            f.close()
+            hash_obj = hashlib.md5()
+            hash_obj.update(data)
+            digest = hash_obj.hexdigest()
+            if watched[name] != digest:
+
+                process(name)
+                watched[name] = digest
+
+        time.sleep(1)