update
Merge branch 'gh-pages' of https://github.com/Brian7974/spiritlife into gh-pages