smth
Merge branch 'master' of github.com:LogvinovLeon/ytParty

Conflicts:
	ytParty/queue/api.py
	ytParty/static/css/style.css