Merge pull request seanmoon#7 from jonathanpberger/master

hook it up, yo'
jonathanpberger · Jul 12, 2011 · 95ff341 · 95ff341
2 parents bb98f9c + 460ec7e
commit 95ff341
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 0 deletions.
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -7,6 +7,7 @@
     = javascript_include_tag 'jquery.autocomplete'
     = javascript_include_tag "http://use.typekit.com/rol0dzy.js"
     = javascript_tag "try{Typekit.load();}catch(e){}"
+    = favicon_link_tag
     = csrf_meta_tag
 
   %body

diff --git a/db/seeds.rb b/db/seeds.rb
@@ -5,3 +5,13 @@
 #
 #   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
 #   Mayor.create(:name => 'Daley', :city => cities.first)
+#
+# <Match id: 1, winner: "Adam", loser: "Bob", created_at: "2011-07-08 00:21:06", updated_at: "2011-07-08 00:21:06", occured_at: "2011-07-07 20:20:59"> 
+#
+Match.create(:winner => "Adam", :loser => "Bob")
+Match.create(:winner => "Bob", :loser => "Carol")
+Match.create(:winner => "Carol", :loser => "Dave")
+Match.create(:winner => "Dave", :loser => "Ed")
+Match.create(:winner => "Adam", :loser => "Carol")
+Match.create(:winner => "Adam", :loser => "Dave")
+Match.create(:winner => "Adam", :loser => "Ed")
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/images/favicon.ico b/public/images/favicon.ico