Merge branch 'edumed' of https://github.com/fnp/redakcja into edumed