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

Conflicts:
	gatk.inc