lavet alt muligt vigtigt
fixed merge konflikt
Merge pull request #48 from ankjaers/issue-#37

Issue #37
Merge remote-tracking branch 'origin/master' into createCheckin