Merged and updated timeline

Removed older files, created new file containing all info