diff --git a/.gitignore b/.gitignore
index e69de29..9672757 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+credentials.php
diff --git a/browse/browse.php b/browse/browse.php
index 49bc699..3238bc2 100644
--- a/browse/browse.php
+++ b/browse/browse.php
@@ -1,4 +1,5 @@
 <?php
+include '../credentials.php';
 
 //Setting up the webpage
 echo '<html>';
@@ -19,10 +20,6 @@ $fileType = array(   // Types of files that are thumbnail'd
 );
 
 // MySQL server connection info
-$servername = "db_address";
-$username = "db_username";
-$password = "db_password";
-$dbname = "db_name";
 
 $count = 0;
 
diff --git a/browse/index.php b/browse/index.php
index b4a1db8..4ad304d 100644
--- a/browse/index.php
+++ b/browse/index.php
@@ -12,8 +12,8 @@
 	<h2>Search by name</h2>
 	<form action="query.php" method="post">
 	
-		Search: <input type="text" name="term" value="Search disabled" disabled/>
-		<input type="submit" name="submit" value="Search" disabled/>
+		<input type="text" name="term" />
+		<input type="submit" name="search" value="Search" />
 	
 	</form>
 
@@ -130,6 +130,14 @@
 					
 						<td align="center"><input type="radio" name="memeCategory" id="memeCategory" value="member" />Member-Specific</td>
 						<td align="center"><input type="radio" name="memeCategory" id="memeCategory" value="thefuck" />The Fuck You Say?</td>
+						<td align="center"><input type="radio" name="memeCategory" id="memeCategory" value="laughing" />Laugh/Laughing</td>
+						<td align="center"><input type="radio" name="memeCategory" id="memeCategory" value="racist" />Racist</td>
+						<td align="center"><input type="radio" name="memeCategory" id="memeCategory" value="spiderman" />Spiderman</td>
+					
+					</tr>
+					<tr>
+					
+						<td align="center"><input type="radio" name="memeCategory" id="memeCategory" value="spongebob" />Spongebob</td>
 					
 					</tr>
 				
diff --git a/browse/query.php b/browse/query.php
new file mode 100644
index 0000000..a5ce18f
--- /dev/null
+++ b/browse/query.php
@@ -0,0 +1,72 @@
+<?php
+	include '../credentials.php';
+	$dir = "../uploads";   // Directory for file uploads
+//Setting up the webpage
+echo '<html>';
+echo '<head>';
+echo '<title>Browse - Meme Machine</title>';
+echo '<style>img {width:100%;max-width:300px;;padding:7px;}</style>';
+echo '</head>';
+echo '<body>';
+echo '<div align="center">';
+echo '<h1>Meme Machine</h1>';
+	
+	$count = 0;
+	//Connect to MySQL
+	$conn = mysqli_connect($servername, $username, $password, $dbname);
+
+	if (!$conn) {
+		die ("CONNECTION FAIL " .mysqli_connect_error());
+	} else {
+	}
+	
+	$term = $_POST['term'];
+	
+	
+	$tokens = explode(' ', $term);
+	$tokens = array_map(
+		function($term) {
+			return mysqli_real_escape_string(trim($term));
+		},
+		$tokens
+	);
+	
+	$sql = "SELECT * FROM memes WHERE name LIKE '$term";
+	$sql .= implode("%' or name LIKE '%", $tokens) . "'";
+
+	if(isset($_POST['search']) && $term){
+		echo "Search term is: " . $term . "<br />";
+		
+		$result = mysqli_query($conn, $sql);	
+		
+		echo $sql;
+		if (mysqli_num_rows($result) > 0) {
+			while($row = mysqli_fetch_assoc($result)) {
+				$count++;
+				echo '<img src="' . $dir . '/' . $row["fileName"] . '" alt="' . $row["name"] . '" />';
+				if ($count == 3) {
+					echo '<br />';
+				}
+			}
+		} else {
+			echo "Your search returned no results. Please go back and try again";
+			?>
+			<p>&nbsp;</p>
+			<a href="./">Back</a>
+			<?php
+	}
+		
+		
+	} else {
+		?>
+		<h1>Please go back and enter a search query</h1>
+		<br />
+		<br />
+		<a href="./">Back</a>
+		<?php
+	}
+
+
+echo '</body>';
+echo '</html>';
+?>
diff --git a/index.php b/index.php
index b546e08..025b3af 100644
--- a/index.php
+++ b/index.php
@@ -118,8 +118,7 @@
 					</tr>
 					<tr>
 					
-						<td align="center"><input type="radio" name="memeCategory" id="memeCategory" value="member" />Member-Specific</td>
-						<td align="center"><input type="radio" name="memeCategory" id="memeCategory" value="thefuck" />The Fuck You Say?</td>
+						<td align="center"><input type="radio" name="memeCategory" id="memeCategory" value="spongebob" />Spongebob</td>
 					
 					</tr>
 				
@@ -141,6 +140,6 @@
 			<br />
 			<br />
 			<br />
-			<h6>Meme Machine v0.2.0 BETA</h6>
+			<h6>Meme Machine v0.3.0 BETA</h6>
 		</div>
 </html>
diff --git a/upload.php b/upload.php
index d84a702..a7de8df 100644
--- a/upload.php
+++ b/upload.php
@@ -1,14 +1,10 @@
 <?php
+include './credentials.php';
 $target_dir = "uploads/";
 $target_file = $target_dir . basename($_FILES["fileToUpload"]["name"]);
 $uploadOk = 1;
 $imageFileType = pathinfo($target_file,PATHINFO_EXTENSION);
 
-$servername = "db_address";
-$username = "db_username";
-$password = "db_password";
-$dbname = "db_name";
-
 $conn = mysqli_connect($servername, $username, $password, $dbname);
 
 $memeDir = mysqli_real_escape_string($conn, basename($_FILES["fileToUpload"]["name"]));
