Merge pull request #1 from Revlin/master

new fork: line-in
code cleanup
manual merge of fork, most of the code cleaned up
upstream merge; rm track.mp3
rt track.mp3