2nd commit
Merge branch 'master' of https://github.com/Gili710/gabi_site
modified on my desktop