add timeline
Merge branch 'master' of https://github.com/evendesign/4am.tw.source

Conflicts:
	sass/all.scss
	stylesheets/all.css