resolved conflicts; merge; save

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

Conflicts:
	tutorials/syncing_forks/syncing_forks.Rmd
another merge fix, maybe a permissions problem

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

Conflicts:
	tutorials/syncing_forks/syncing_forks.Rmd