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

Conflicts:
	Gemfile.lock
	config/routes.rb

db/migrate/20140507125633_create_fetmeetings.rb

@@ -0,0 +1,10 @@
+class CreateFetmeetings < ActiveRecord::Migration
+  def change
+    create_table :fetmeetings do |t|
+      t.text :tnlist
+      t.integer :typ
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20140507130354_create_fetmeetingtops.rb

@@ -0,0 +1,13 @@
+class CreateFetmeetingtops < ActiveRecord::Migration
+  def change
+    create_table :fetmeetingtops do |t|
+      t.string :title
+      t.text :text
+      t.text :discussion
+      t.string :ersteller
+      t.integer :fetmeeting_id
+
+      t.timestamps
+    end
+  end
+end