Merge pull request #15 from otlet/master

merge#666
guyghuj;m
dodanie pliku ze skróconymi portfolio (portf.html)
dodanie portf.html (lol)
kastracja zbędnych adresów do podstron
bazowa budowa shop.html
Lekkie zmiany w ceesesach i odwo�ania do bootstrapa zwyk�ego
Merge remote-tracking branch 'origin/develop--koozil' into develop--otlet

Conflicts:
	Strona/index.html
Merge branch 'develop--otlet' of https://github.com/otlet/ProjektnaSpecki into develop--otlet

Conflicts:
	Strona/index.html
Merge pull request #16 from otlet/develop--otlet

Develop  otlet