conflict!
Merge branch 'master' of github-srki2.com:bbavrljic/fuubar2

Conflicts:
	readme.txt