dupa
Merge remote-tracking branch 'origin/master'

Conflicts:
	maszyny.pro.user