Documentation began
Merge branch 'master' of https://github.com/Smarco10/LO21_P13_project

Conflicts:
	code/Document.h
	code/Note.h
Merge branch 'master' of https://github.com/Smarco10/LO21_P13_project

Conflicts:
	code/Document.h
	code/Workspace.h