try to create conflict in README
edit readme to create a conflict.
fixed conflic
edit readme to mention git mergetool.
figure out merging
merge tool is called bbdiff. It might only be a diff tool.
merge feature/Daniel into develop
add parsing example pdf
bbdiff comments in readme
Merge branch 'feature/Daniel' into develop

Conflicts:
	README.md
remove merge shpongle from readme
edit readme
Merge branch 'feature/Daniel' into develop
edit readme, add one heading
update develop's readme
Merge branch 'feature/Daniel' into develop

Conflicts:
	README.md
update readme
edit readme
edit readme
merge feature/Daniel into develop