recovering from the git fiasco
Merge branch 'master' of github.com:Delius/painmanager