added czieglerFile.txt and src-Folder
added func2 to main.c
hallo
added function lol()
Merge branch 'cziegler'

Conflicts:
	main.c
added tools.c and tools.h in src folder
Merge branch 'newMasterBranch'
Merge branch 'frank-branch'
testfunc added weiterarbeitNachMergeMitMaster()
Merge branch 'cziegler'

Conflicts:
	main.c