added func2 to main.c
hallo
Merge branch 'cziegler'

Conflicts:
	main.c
added tools.c and tools.h in src folder
test in der vergangenheit
Merge branch 'newMasterBranch'
Merge branch 'frank-branch'
Merge branch 'cziegler'

Conflicts:
	main.c