First commit
Merge branch 'master' of https://github.com/katiaabela/SoftwareEngineering

Another commit