Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch master
 Your branch is ahead of 'origin/master' by 5 commits.

 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   lib/t2l-lib/t2l-screamer.lisp
 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch master
 Your branch is ahead of 'origin/master' by 6 commits.

 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   lib/t2l-lib/music-conversion.lisp
Merge https://github.com/emergn36/music-conversion

Conflicts:
	lib/t2l-lib/music-conversion.lisp