colored timelines
no colored timelines
conflict fix
some comments deleted
gemfile changed