Merge branch 'master' of git.uio.no:u/erikhf/frm
authorJulie Hill Roa <julie.hill.roa@gmail.com>
Sun, 6 Dec 2015 18:53:33 +0000 (19:53 +0100)
committerJulie Hill Roa <julie.hill.roa@gmail.com>
Sun, 6 Dec 2015 18:53:33 +0000 (19:53 +0100)
* 'master' of git.uio.no:u/erikhf/frm:
  litt design


Trivial merge