do less
Merge branch 'new'

Conflicts:
	package.json
	src/mpdparser.co