C26q2 setup#32

yzhou-cmap wants to merge 2 commits intoCMAP-REPOS:c26q2_setupCMAP-REPOS/cmap_trip-based_model:c26q2_setupfrom

yzhou-cmap:c26q2_setupyzhou-cmap/cmap_trip-based_model:c26q2_setupCopy head branch name to clipboard