change feeds
Merge branch 'master' of https://github.com/ironreality/homedir

Conflicts:
	.canto/conf.py
change feeds