Task 1 done
Merge branch 'master' of github.com:hvatum/TDT4125
Starting part 2 SA