move additions to their own lines between primary lines
Merge pull request #35 from jgsmith/master

move additions to their own lines between primary lines in the text display
solved conflicts, use theirs