QR continued...
More fixes...
Merge branch 'master' of https://github.com/metnum/2013-2c-tp3