smokebox ubdated ChipseqSummary
Merge branch 'master' of github.com:allPowerde/ngsane
bugfix trinity commented out
Merge remote-tracking branch 'upstream/master'

Conflicts:
	core/makeSummary.sh