Ryne's update
Merge branch 'master' of https://github.com/drknexus/repsych

Conflicts:
	R/catseye.r
	man/catseye.Rd