merge commit
Merge branch 'master' of https://github.com/koenk/software-engineering-team6
fixed list + fixed line ending