Timeline initial
Controller Index and Error
merge
Merge branch 'paznar-master'