Added bacon
Modified bacon
Modified testje
Merge branch 'Bacon'

Conflicts:
	testje.txt