Merge branch 'master' of https://github.com/donboyd5/btools

Conflicts:
	inst/RPackageCreationforbtools.r
Merge branch 'master' of https://github.com/donboyd5/btools