aa
Merge branch 'Nicolas' of https://github.com/eerico/Master-semester-project into Nicolas