test bilde
Merge branch 'master' of github.com:tkolsen/myplanner