Solving merge conflicts.

Martin och Christian
Merge branch 'master' of github.com:RichardSimko/EDA260-Team09