update

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

Conflicts:
	web/server/content/life/manage/timeline/201407.md
	web/server/content/project/manhattan/gym/index.md