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

Conflicts:
	config/routes.rb

spec/models/fetprofile_spec.rb

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

spec/models/fetznedition_spec.rb

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

spec/models/foto_spec.rb

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

spec/models/gallery_spec.rb

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

spec/models/gremium_spec.rb

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

spec/models/membership_spec.rb

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