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

Conflicts:
	git/notes.txt
commit all
adding in bio
Merge pull request #1 from karistenneson/master

my bio