Merge branch 'develop' into help_develop

Conflicts:
	.gitignore

1 files changed, 2 insertions, 4 deletions

diff --git a/config/routes.rb b/config/routes.rb
index ca8d753..3b29251 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,6 @@
 LeapWeb::Application.routes.draw do
+  root :to => "home#index"
+
   # The priority is based upon order of creation:
   # first created -> highest priority.
 
@@ -46,10 +48,6 @@ LeapWeb::Application.routes.draw do
   #     resources :products
   #   end
 
-  # You can have the root of your site routed with "root"
-  # just remember to delete public/index.html.
-  # root :to => 'welcome#index'
-
   # See how all your routes lay out with "rake routes"
 
   # This is a legacy wild controller route that's not recommended for RESTful applications.