added notes
edits
Merge branch 'final-edit'

Conflicts:
	introduction.txt