merging; new compose type and time code
merge successful
committing potentially broken code
adding merged BROKEN compose type code
Merge branch 'master' of https://github.com/scobb/Impromptu