Added branch
Merge branch 'master' of https://github.com/TorChrEriksen/TTK4145 into MS_Prototyping
Trying to add my own branch
Branch update and exercise 7 started
Made ex7 compile
Corrected errors and make it work correctly (hope so)
Fixed conflict