[Add] timeline.html
[Merge] conflict files

Conflicts:
	public/html/partials/timeline.html