Trying to resolve merge conflict

Merge branch 'master' of github.com:rakosnicek/mhnet

Conflicts:
	man/BICcovar.Rd
Merge branch 'master' of github.com:rakosnicek/mhnet