refactor
c
Merge branch 'master' of https://github.com/jojcoto/mojerepozytorium.git
cos
cd
Merge remote-tracking branch 'upstream/master'

Conflicts:
	tasks/bmptask/.gitignore
	tasks/bmptask/bin/.gitignore