pref, replacing features to match user stories.
Merge branch 'master' of https://github.com/GuillaumeDerval/SINF1225