processed internal feedback
Merge branch 'master' of https://github.com/Fingerpaint/project-docs

Conflicts:
	STD/chapter6.tex