add feedly
Merge branch 'master' of https://github.com/jackyfyl/files.git

Conflicts:
	goagent.pac