committing old changes
committing changes without conflict

Merge branch 'master' of https://github.com/brooksandrew/Rsenal

Conflicts:
	man/Rsenal.Rd
merging changes on Rsenal.Rd