Fix channel merge
Merge branch 'graph' of https://github.com/detomon/bliplay into graph

Conflicts:
	bliplay/graph.c