:w

Test
I
Merge branch 'master' of https://github.com/PPP12345/Schwulenverein-SanFrancisco-Gruppe23

Conflicts:
	src/config.c
	src/main.c