Added basic functionality for the text editor
Added stylings to the document writer
Merging before commit.
Conlfict merging