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

Conflicts:
	Gemfile.lock
	config/routes.rb

spec/models/fetmeeting_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Fetmeeting do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

spec/models/fetmeetingtop_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Fetmeetingtop do
+  pending "add some examples to (or delete) #{__FILE__}"
+end