Added some notes to notes.txt
Merge branch 'master' of https://github.com/ChristinaLK/swcarpentry-uw-material

Conflicts:
	git/notes.txt
adding participants folder
Merge branch 'master' of https://github.com/ChristinaLK/swcarpentry-uw-material

Conflicts:
	git/notes.txt
Took the github version of notes.txt
Added a file with my name and stuff