nothing
Merge branch 'master' of https://github.com/oyvindrobertsen/TDT4100-Project
Merge branch 'master' of https://github.com/oyvindrobertsen/TDT4100-Project
Merge branch 'master' of https://github.com/oyvindrobertsen/TDT4100-Project
minor collision fixes