Merge branch 'develop--otlet' into develop--koozil

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

Conflicts:
	Strona/contact.html
Technologie
Merge remote-tracking branch 'origin/master' into develop--koozil
Merge remote-tracking branch 'origin/develop--otlet' into develop--koozil
Merge pull request #24 from otlet/develop--koozil

Develop  koozil