Merge branch 'master' of https://github.com/Inachos/fetsite

Conflicts:
	Gemfile.lock
	config/routes.rb

spec/requests/fetmeetings_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe "Fetmeetings" do
+  describe "GET /fetmeetings" do
+    it "works! (now write some real specs)" do
+      # Run the generator again with the --webrat flag if you want to use webrat methods/matchers
+      get fetmeetings_path
+      response.status.should be(200)
+    end
+  end
+end

spec/requests/fetmeetingtops_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe "Fetmeetingtops" do
+  describe "GET /fetmeetingtops" do
+    it "works! (now write some real specs)" do
+      # Run the generator again with the --webrat flag if you want to use webrat methods/matchers
+      get fetmeetingtops_path
+      response.status.should be(200)
+    end
+  end
+end