add average.line.cond
Merge branch 'master' of ssh://git@github.com/jlaake/mrds.git

Conflicts:
	mrds/man/average.line.cond.Rd
add average.line.cond