...
:x
Merge branch 'master' of https://github.com/Schwoisser/Globalefreiheit

Conflicts:
	config.ru
Merge branch 'master' of https://github.com/Schwoisser/Globalefreiheit

Conflicts:
	Gemfile
	Gemfile.lock
Merge branch 'master' of https://github.com/Schwoisser/Globalefreiheit
Merge branch 'master' of https://github.com/Schwoisser/Globalefreiheit
Merge branch 'master' of https://github.com/Schwoisser/Globalefreiheit
Merge branch 'master' of https://github.com/Schwoisser/Globalefreiheit
Merge branch 'master' of https://github.com/Schwoisser/Globalefreiheit

Conflicts:
	Gemfile
	public/images/slider/132.jpg