Delete and test for merge

Conflict? Yes = success
Merge branch 'dibaggioj'
Replace line of code

Replace. Should be no conflict with merge.
Merge branch 'bittelc'

Conflicts:
	README.md
Merge branch 'master' into bittelc
Type

typo
Merge branch 'bittelc'
Merge branch 'dibaggioj'

Conflicts:
	README.md
Merge branch 'master' into dibaggioj