merge-pheno-and-data.R function created and bugs in delete column fixed.
Merge branch 'master' of https://github.com/chipster/chipster.git