updated work history
Merge branch 'timeline-gem'