minor
Merge branch 'master' of https://github.com/pari685/AStream

Conflicts:
	dist/client/dash_client.py