add new types, change colors, do some more clever bits
Merge branch 'master' of github.com:shannonwells/clickbait_generator