+ mergowanie
Merge branch 'master' of github.com:bdolewski/masterthesis

Conflicts:
	bibliography.bib