Ingen forelesning i morgen - som annonsert
Merge branch 'master' of https://github.com/hioa-cs/cpp_v2013