refactor
Merge branch 'master' of github.com:Ndragomirov/twitch-now