no
Merge branch 'master' of https://github.com/poloure/drunken-archer

Conflicts:
	src/yay/poloure/simplerss/main_view.java