ongoing branch commit
second temp file
added master text file for editing on the master branch.
Merges master into temp, for the new changes in master while ongoing changes in temp need to be made.
Merge branch 'ongoing_branch'
Merge branch 'temp'