create timeline

fixed top buttons links
inté timeline
reindent
variables names clean
resolve conflicts
Merge pull request #10 from Sidnah/timeline

create timeline