Unnütze commit message - branching (gregor demo)
noch unnützere commit msg (demo gregor branching)
Merge branch 'master' into Featurebla(gregordemo)

Conflicts:
	src/main.c
Merge branch 'Featurebla(gregordemo)'

Conflicts:
	src/main.c