...
Merge branch 'master' of github.com:golf128/pianobar_IR

Conflicts:
	learn.c