Acceptanstester 3
Acceptanstester 3
Merge pull request #29 from buren/Task3.5

Task3.5
Merge branch 'master' of github.com:buren/enduro into time_refactor