d
w
Merge branch 'master' of github.com:RofaelEmil/RSSMagnet

Conflicts:
	.gitignore