timeline changes
Merge branch 'master' of https://github.com/pszjmb1/dossier
timeline.js changes
Conflicts:
	client/stylesheets/dossier.css
	server/fixtures.js