pull request test
Merge branch 'master' of https://github.com/ChristinaLK/swcarpentry-uw-material

Conflicts:
	git/notes.txt
adding participants folder
commit all
adding in bio