Vegard Engen - 2014-12-02

Oops. I forgot to make an unified diff. Updated.