Mer generell uppg 4.
Merge branch 'master' of https://github.com/bosse89/ann14