dev null
ignore
Merge branch 'master' of https://github.com/raylim/scripts
merge
Merge branch 'master' of https://github.com/raylim/scripts

commit
Merge branch 'master' of https://github.com/raylim/scripts
merge
Merge branch 'master' of https://github.com/raylim/scripts
merge
Merge branch 'master' of https://github.com/raylim/scripts

Conflicts:
	fathmmVcf.R