added final steps; saved figs with z a the front

so that they will be below the actual .rmd and .md files, which will be easier to find
resolved conflicts; merge

Merge branch 'master' of https://github.com/OHI-Science/ohimanual

Conflicts:
	tutorials/syncing_forks/syncing_forks.Rmd