str
Merge branch 'dev' of https://github.com/lelouch-mayher/headphones_channel into dev

Conflicts:
	.gitignore
jon