add a few file stubs
edit readme
update readme
update readme
add project specification from Professor
some stub files, trying to determine the way data should be parsed (not yet understood)
add comment to README
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