update

update
Merge branch 'master' of https://github.com/allengaller/spotlight-site

Conflicts:
	web/server/content/life/manage/timeline/201405.md