Merge branch 'master' of https://github.com/poloure/drunken-archer
Need to pull
Merge branch 'master' of https://github.com/poloure/drunken-archer
Added dialog for adding new feeds.
Merge branch 'master' of https://github.com/poloure/drunken-archer

Conflicts:
	src/yay/poloure/simplerss/main_view.java
Merge pull request #6 from Currfyg/master

Merge