cs4241-18a · Ein31 · Aug 30, 2018 · Aug 30, 2018 · Aug 30, 2018 · Aug 30, 2018
diff --git a/README.md b/README.md
@@ -1,77 +1,10 @@
-Assignment 1 - Hello World: Basic Deployment w/ Git, GitHub, Heroku  
-===
+Cameron Maitland  
+https://a1-ein31.herokuapp.com/
 
-This assignment is a "warm-up" exercise. 
-You will simply deploy the starting Web site that you will use this term to the [Heroku Web platform](http://www.heroku.com/). 
-
-Refer to [Getting started with node.js on Heroku](https://devcenter.heroku.com/articles/getting-started-with-nodejs#introduction).
-
-(Thanks to past instructors of the course, here is a short [getting started with Heroku movie](http://web.cs.wpi.edu/~gpollice/Movies/HerokuGettingStarted/) that may also help.)
-
-Treat this assignment as a chance to get up to speed on Git, GitHub, and Heroku. 
-If you already know these, great. 
-However, if you're new to them, spend several hours practicing, experimenting, and reading documentation. 
-In other words, don't just get your website up and done. You will need skill with these tools throughout the rest of the course.
-
-Assignment details
----
-
-Do the following to complete this assignment:
-
-1. Fork the starting project code. This repo contains:
-    * the server code, `server.js`
-    * the `Procfile` that you need for Heroku deployment
-    * A starting `index.html` file that you will edit as described below
-2. Edit `index.html` to show the following information about you:
-    * your name and class at WPI (e.g. class of 2020) Note: Do not put any contact or personal information that you do not potentially want other people outside of this class to see.
-    * your major(s) and minor(s)
-    * previous computer science courses that you have taken at WPI
-    * your experience with the following technologies and methods (none, some, a lot)
-        * HTML
-        * CSS
-        * Java
-        * JavaScript
-        * Ruby
-        * Python
-        * unit testing
-3. Test your project to make sure that when someone goes to your main page, it displays correctly.
-4. Deploy your project to Heroku.
-5. Ensure that your project has the proper naming scheme (guide follows) so we can find it.
-6. Modify the Readme to the specification below.
-7. Create and submit a Pull Request to the original repo.
-
-Naming and URL Scheme
----
-
-You must use a consistent naming scheme for all projects in this course.
-If we can't find it, we can't grade it.
-
-By default Heroku assigns your application a random name.
-To change it, follow [this guide](https://devcenter.heroku.com/articles/renaming-apps).
-
-The name scheme should be `a1-yourGitHubUsername`.
-The `a1` will need to be updated to `a2`, `a3`, and so on in future projects.
-
-Resources
----
-
-If you need a JavaScript/HTML/CSS refresher, see [Technology Fundamentals by Scott Murray](http://chimera.labs.oreilly.com/books/1230000000345/ch03.html#_html) and/or [JavaScript Codeacademy](https://www.codecademy.com/en/tracks/javascript).
-
-If you need a Git/GitHub refreseher, see [GitHub Bootcamp](https://help.github.com/categories/bootcamp/), the [GitHub Guides](https://guides.github.com/) (especially the ones on Hello World, and Understanding the GitHub Flow, and Forking Projects), and [CodeSchool's Try Git Course](https://www.codeschool.com/courses/try-git).
-
-Sample Readme (delete the above when you're ready to submit, and modify the below so with your links and descriptions)
----
-
-Lane Harrison  
-http://codementum-a1.herokuapp.com
-
-This project shows ...
 
 ## Technical Achievements
-- **Proved P=NP**: Using a combination of...
-- **Solved AI**: ...
+
 
 ### Design Achievements
-- **Re-vamped Apple's Design Philosophy**: Shown in `style.css`, the code...
 
 
diff --git a/index.html b/index.html
@@ -2,26 +2,115 @@
   <head>
     <title>CS4241 Assignment 1</title>
     <meta charset="utf-8">
+    <link rel="stylesheet" type="text/css" href="style.css">
+    <style>
+      body {
+        background-color: #748b89;
+        font-family: Georgia, 'Times New Roman', Times, serif
+      }
+
+      table {
+        border: 1px;
+      }
+
+      th, td {
+        padding: 10px;
+      }
+    </style>
+
   </head>
   <body>
-    <h1>Information about [Your name here]</h1>
-    <p>
-      [Self introduction]
-    </p>
-    <p>
-      [Major and other information]
-    </p>
+    <h1>Cameron Maitland</h1>
     <p>
-      [Other things]
+      I'm currently completing my final term at WPI. In my free time I do video game cheat and bot development for a few games. I'm a big dog and bird person. I love any show on netflix that's over 1 season.
     </p>
 
-    <h2>Experience</h2>
+
+    <h2>Major:</h2>
     <p>
-      Working experience
+      Computer Science
     </p>
+
+    <h2>Work Experience</h2>
     <ul>
-      <li>IBM/Rational</li>
-      <li>WPI</li>
+      <li>Software Development Intern, Polamer Precision</li>
+      <li>Math Tutor (Geometry, Algebra, and Calculus)</li>
+      <li>Landscaping</li>
     </ul>
+
+    <h2>Previous Courses</h2>
+
+    <table>
+      <tr>
+        <th>ID</th>
+        <th>Course</th>
+      </tr>
+      <tr>
+        <td>4401</td>
+        <td>Software Security Engineering</td>
+      </tr>
+      <tr>
+        <td>4432</td>
+        <td>Database Systems II</td>
+      </tr>
+      <tr>
+        <td>4518</td>
+        <td>Mobile and Ubiquitous Computing</td>
+      </tr>
+      <tr>
+        <td>3041</td>
+        <td>Human Computer Interaction</td>
+      </tr>
+      <tr>
+        <td>3516</td>
+        <td>Computer Networks</td>
+      </tr>
+      <tr>
+        <td>3733</td>
+        <td>Software Engineering</td>
+      </tr>
+      <tr>
+        <td>4731</td>
+        <td>Computer Graphics</td>
+      </tr>
+      <tr>
+        <td>3133</td>
+        <td>Foundations of Computer Science</td>
+      </tr>
+    </table>
+
+    <h2>Technologies and Methods Experience</h2>
+
+    <ul>
+      <li>
+        <h3>HTML</h3>
+        <p>Enough to get things done. I know basic tags. I can list most things you need to get things done but I sometimes have to google which tags correspond to what</p>
+      </li>
+      <li>
+        <h3>CSS</h3>
+        <p>A little less than html. I usually use bootstrap if I have to do it. For padding and stuff though I have to consult the documents a lot</p>
+      </li>
+      <li>
+        <h3>Java</h3>
+        <p>Can work in it perfectly fine I just need to look up any docs for specific frameworks or projects I need to work with</p>
+      </li>
+      <li>
+        <h3>JavaScript</h3>
+        <p>I've done work with it. Can do things self sufficiently but need to look at documentation for specific frameworks</p>
+      </li>
+      <li>
+        <h3>Ruby</h3>
+        <p>No Experience</p>
+      </li>
+      <li>
+        <h3>Python</h3>
+        <p>No issues working with it, pretty straight forward</p>
+      </li>
+      <li>
+        <h3>Unit Testing</h3>
+        <p>Had to do it for intro cs courses, did it at internship, and do it for personal projects.</p>
+      </li>
+    </ul>
+
   </body>
 </html>
diff --git a/server.js b/server.js
@@ -30,4 +30,4 @@ function sendFile(res, filename) {
     res.end(content, 'utf-8')
   })
 
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,4 +30,4 @@ function sendFile(res, filename) { @@
         res.end(content, 'utf-8')
       })
-    }
+    }