my777
Merge branch 'develop' of https://github.com/KarolAltamirano/projekt into develop

Conflicts:
	index.html