Konflikt-kammar.
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/Oddsor/TDT4280e3.git
Expression class implemented.