Use cache
Merge branch 'master' of https://github.com/f3ndot/justinbull-site

Conflicts:
	life-status.php
Odd gitness