aa
Merge branch 'master' of https://github.com/shawwwn/KRss

Conflicts:
	.gitignore
	.idea/workspace.xml
	Scraper/db.txt
	Scraper/makebook.pyc