Forelesning 3 og 4
Merge branch 'master' of https://github.com/hioa-cs/cpp_v2014