testing adding notes.txt
resoved confilict in notes.txt
adding participants folder
re merged notes.txt