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

Conflicts:
	app/controllers/neuigkeiten_controller.rb
	config/routes.rb

config/routes.rb

@@ -1,4 +1,11 @@
-Fetsite::Application.routes.draw do
+
+ Fetsite::Application.routes.draw do
+  resources :fetmeetingtops
+
+
+  resources :fetmeetings
+
+
   themes_for_rails
   devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" }
   resources :home, :only=>[:index] do