diff --git a/app/controllers/glossary_terms_controller.rb b/app/controllers/glossary_terms_controller.rb
index 8bd0e1c..88681b3 100644
--- a/app/controllers/glossary_terms_controller.rb
+++ b/app/controllers/glossary_terms_controller.rb
@@ -1,5 +1,6 @@
 class GlossaryTermsController < ApplicationController
 
   def index
+    @glossary_terms = GlossaryTerm.all
   end
 end
diff --git a/app/views/glossary_terms/index.html.erb b/app/views/glossary_terms/index.html.erb
index 9b67204..762e6f0 100644
--- a/app/views/glossary_terms/index.html.erb
+++ b/app/views/glossary_terms/index.html.erb
@@ -1 +1,22 @@
 <h2>GlossaryTermsController#index</h2>
+
+<table>
+  <thead>
+    <tr>
+      <td>name</td>
+      <td>description</td>
+    </tr>
+  </thead>
+  <tbody>
+    <% @glossary_terms.each do |term| %>
+    <tr>
+      <td>
+	<%= term.name %>
+      </td>
+      <td>
+	<%= term.description %>
+      </td>
+    </tr>
+    <% end %>
+  </tbody>
+</table>