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

Conflicts:
	dlbcl_snp6/Makefile