<!DOCTYPE html>
  <html>
  <head>
    <link type="text/css" rel="stylesheet" href="../stylesheets/project-index.css" />
    <link href='https://fonts.googleapis.com/css?family=Roboto+Slab' rel='stylesheet' type='text/css'>
    <title>Projects</title>
  </head>
  <body>
    <h3>Processing</h3>
    <p>Below are a selection of my projects for New York University's Interactive Computing class with Professor Craig Kapp in the fall of 2014. The projects are all written in Processing and are listed in chronological order, culminating with 'Doodle Jump' - my final project for the class.</p>
    <div class="title"><a href="bart-sketch.html">Clickable Bart Simpson</a></div>
    <div class="title"><a href="chase-game.html">Frogger Soccer</a></div>
    <div class="title"><a href="halloween-game.html">Spooky Halloween Game</a></div>
  </body>
</html>
<!DOCTYPE html>
  <html>
  <head>
    <link type="text/css" rel="stylesheet" href="../stylesheets/project-index.css" />
    <link href='https://fonts.googleapis.com/css?family=Roboto+Slab' rel='stylesheet' type='text/css'>
    <title>Projects</title>
  </head>
  <body>
    <h3>Processing</h3>
    <p>A selection of my projects for New York University's Interactive Computing class with Professor Craig Kapp in the fall of 2014. The projects are all written in Processing and are listed in chronological order, culminating with 'Doodle Jump' - my final project for the class.</p>
    <div class="title"><a href="bart-sketch.html">Clickable Bart Simpson</a></div>
    <div class="title"><a href="chase-game.html">Frogger Soccer</a></div>
    <div class="title"><a href="halloween-game.html">Spooky Halloween Game</a></div>

    <h3>Ruby / Rails</h3>
    <p>Projects completed at Dev Bootcamp in the summer of 2015.</p>
    <div class="title"><a href="https://nofenceschicago.herokuapp.com">NoFences (Final Project)</a></div>
  </body>
</html>
Resolve merge conflict and fix NoFences link
Resolve merge conflict and fix NoFences link
