daily update
Merge branch 'master' of https://github.com/ITboy/me

Conflicts:
	life.org
	work.org