Merge remote-tracking branch 'origin/develop--otlet' into develop--koozil
cycki

Conflicts:
	Strona/index.html
edycja batona w bootstrap.css
Zmiany w css
Merge branch 'develop--koozil' of https://github.com/otlet/ProjektnaSpecki into develop--koozil

Conflicts:
	Strona/css/bootstrap.css
Merge branch 'master' into develop--koozil
Filmiki new
Lekkie zmiany w css + batony w index
zmiany w szopie
Merge remote-tracking branch 'origin/develop--koozil' into develop--otlet

Conflicts:
	Strona/index.html