docs update
conflict res
Merge pull request #157 from meetup/segment-header

touchList-segment-header style update