derge branch 'categories'

Merging categories and master branch:
changed colors
Merge branch 'master' of github.com:rbtkoz/Timeline_History_Innov

Merging files