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

Conflicts:
	Gemfile.lock
	config/routes.rb

spec/helpers/fetmeetings_helper_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the FetmeetingsHelper. For example:
+#
+# describe FetmeetingsHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       expect(helper.concat_strings("this","that")).to eq("this that")
+#     end
+#   end
+# end
+describe FetmeetingsHelper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

spec/helpers/fetmeetingtops_helper_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the FetmeetingtopsHelper. For example:
+#
+# describe FetmeetingtopsHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       expect(helper.concat_strings("this","that")).to eq("this that")
+#     end
+#   end
+# end
+describe FetmeetingtopsHelper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end