- trying to resolve conflicts
Merge branch 'master' of github.com:fongchun/CLC-projects

Conflicts:
	dlbcl_snp6/Makefile
- fixed a bug where the data directory was not being linked to in the sub oncosnp recipes