non-working backup commit
Merge branch 'master' of github.com:andreasjansson/andreasmusic