fix
Merge branch 'master' of https://github.com/zanderdk/OOP-Eksamensprojekt2014