Fixed 24 hour format error
Merge branch 'master' of github.com:jonatanl/fellesprosjekt