Merge branch 'master' of git.uio.no:u/erikhf/frm
authorJulie Hill Roa <julie.hill.roa@gmail.com>
Sun, 6 Dec 2015 15:06:50 +0000 (16:06 +0100)
committerJulie Hill Roa <julie.hill.roa@gmail.com>
Sun, 6 Dec 2015 15:06:50 +0000 (16:06 +0100)
* 'master' of git.uio.no:u/erikhf/frm:
  Cleanup
  Added message for no result when searching


Trivial merge