committing last changes
Merge branch 'Merging' of https://github.com/daniriv12/Web-Atelier-Final into Merging
committing last changes'