TimeLine colorizor implemented
Merge remote-tracking branch 'upstream/master'
Merge pull request #16 from candyforchris/master

Colorizor implemented in timeline