updated author
updated author headings
merged in hotfix from master
Merged with master
augmented comment
comment
Merge branch 'experimental2'

Conflicts:
	Demo01/src/prettyprint.h
sorted
author
Another comment
Merged change
Edit
Merge branch 'experimental2'
change on branch
hot fix on master
Merge branch 'experimental3'
roll back
roll back
Added generic prettyprint
Merrged