url in life.html updated
Merge branch 'master' into gh-pages