Goals implemented
Merge branch 'master' of https://github.com/orhels/TDT4240-A25
Merge fix