fixed merge

Merge branch 'master' of github.com:bcow/pecan

Conflicts:
	scripts/Rfcn.R
Merge branch 'master' of github.com:bcow/pecan

Conflicts:
	scripts/Rfcn.R