Merge remote-tracking branch 'origin/master' into StianHH
Merge branch 'master' of https://github.com/bflugon/fellesprosjekt into StianHH
Started working on the DatabaseHandler