To pull
Merge branch 'master' of github.com:asider/dashview

Conflicts:
	src/dashview.cc
Add playbuffer and player