Merge branch 'master' of https://github.com/androidc/lrss

Conflicts:
	README.md
Merge branch 'master' of https://github.com/androidc/lrss