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

Conflicts:
	Strona/index.html
kurwa
About add
asd
Merge branch 'master' into develop--otlet

Conflicts:
	Strona/index.html
Merge branch 'develop--otlet'

Conflicts:
	Strona/about.html