Merge head

diff --git a/config/routes.rb b/config/routes.rb
index 82474df671b63add51df0e59463c75874aaebf78..cce54e96e432cecbaf9710877ebddf5ce49090ad 100644 (file)
--- 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',