work on manuscript
Merge branch 'master' of https://github.com/enewe101/miniproject2

Conflicts:
	docs/man.tex