modified
Merge remote-tracking branch 'origin/gh-pages' into timeline

Conflicts:
	css/style.css