"Added support for play/pause text changes."
Trying a merge...
Merge branch 'master' of github.com:daekano/beard into seek

Conflicts:
	app/js/beard.js
Fixed merge?