Merge pull request #16 from otlet/develop--otlet

Develop  otlet
Merge branch 'develop--koozil'
Merge branch 'master' of https://github.com/otlet/ProjektnaSpecki

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

Conflicts:
	Strona/index.html