fixed merge cell types code
Merge branch 'master' of github.com:amynguyen93/fcs_scripts
merge and annotate fixed