Attempt to commit my notes to CLK's repo
Resolved a conflict in git/notes.txt
adding participants folder
Merge branch 'master' of https://github.com/ChristinaLK/swcarpentry-uw-material

Conflicts:
	git/notes.txt
Added a new file