see changelog for details
Merge branch 'master' of https://github.com/nicopenaredondo/Software_Engineering_CSCI15