debugging the change to df calculation
still debugging new df calculation

Merge branch 'master' of github.com:wrbrooks/SGL

Conflicts:
	R/SGLmain.R