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

Conflicts:
	app/views/layouts/menu.html.erb
	config/routes.rb

spec/helpers/calendars_helper_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the CalendarsHelper. For example:
+#
+# describe CalendarsHelper 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 CalendarsHelper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

spec/helpers/calentries_helper_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the CalentriesHelper. For example:
+#
+# describe CalentriesHelper 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 CalentriesHelper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end