Added text in newfile.txt in master branch
Added new stuff in README.txt
Merging.. Hopefully fixed conflicts
1st commit in branch2