fixes to manual
Fixing up merge conflicts

Conflicts:
	UserManual/.Rapp.history
	UserManual/.Rhistory
	UserManual/NimbleUserManual.Rnw
	UserManual/NimbleUserManual.aux
	UserManual/NimbleUserManual.pdf