gitignore
Merge branch 'master' of http://github.com/fetsite/fetsite

gitignore conflikt behoben
faqs oberfläche
small fixes rubriken und themen
Merge branch 'master' of http://github.com/mleop/fetsite
gemfile-lock ignore
Merge branch 'master' of github.com:fetsite/fetsite