changed name and dates
Merge branch 'master' of https://github.com/amaiberg/software-engineering-preliminary