Fixed addEvent
Merge branch 'master' of github.com:jonatanl/fellesprosjekt