clean-css conflict
Merge branch 'master' of https://github.com/ListnPlay/socketstream

Conflicts:
	package.json