Resolves conflicts in MetaQTL4 code
Merge pull request #219 from harmjanwestra/master

Resolves conflicts in MetaQTL4 code
Merge branch 'master' of https://github.com/molgenis/systemsgenetics