solved conflict
Solved

Merge branch 'master' of https://github.com/mbask/forestry

Conflicts:
	R/ttBasalArea.R
	man/ttBasalArea.Rd