add secondary data line
fix merging problems
Merge branch 'master' of https://github.com/flinn/Sentimize