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

Conflicts:
	Gemfile.lock
	config/routes.rb

spec/factories/fetmeetings.rb

@@ -0,0 +1,8 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :fetmeeting do
+    tnlist "MyText"
+    typ 1
+  end
+end

spec/factories/fetmeetingtops.rb

@@ -0,0 +1,11 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :fetmeetingtop do
+    title "MyString"
+    text "MyText"
+    discussion "MyText"
+    ersteller "MyString"
+    fetmeeting_id 1
+  end
+end