raport merge
Merge branch 'master' of github.com:mpiotrowski/WBO

Conflicts:
	raport.pdf
	raport.tex