added czieglerFile.txt and src-Folder
added function lol()
Merge branch 'cziegler'

Conflicts:
	main.c