Fox update
Merge branch 'master' of https://github.com/Beardstorm/Grupp2ZooUppgift