From: John Dong <jdong@mit.edu>
Date: Wed, 29 Aug 2007 20:59:56 +0000 (-0400)
Subject: Merge head
X-Git-Url: https://projects.mako.cc/source/selectricity/commitdiff_plain/7ba8ee2cda418a31e95e8c59151ebebc3b92defe?hp=108e84df50f2395c475886a83da9f1799b4b29cc

Merge head
---

diff --git a/config/routes.rb b/config/routes.rb
index 82474df..cce54e9 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -11,6 +11,7 @@ ActionController::Routing::Routes.draw do |map|
 
   # You can have the root of your site routed by hooking up '' 
   # -- just remember to delete public/index.html.
+  map.connect 'index.html', :controller => "site", :action => "index"
   map.connect '', :controller => "site", :action => "index"
   map.connect '/sitealizer/:action', :controller => 'sitealizer' 
   map.connect 'quickvote/:action/:id',