changing the notes.txt file
changing the notes file again after pulling
adding participants folder
merging conflict in notes file
adding sample.txt