Added text in newfile.txt in branch1
Fixed ortographic mistakes
Merging.. Hopefully fixed conflicts