making sure the package passes all the checks
solved merge conflicts

Merge branch 'master' of https://github.com/jonathancornelissen/highfrequencyGSOC

Conflicts:
	R/highfrequencyGSOC.R
	man/BNSjumptest.Rd