index stuff
Merge branch 'master' of https://github.com/adispen/twitch-frontier
rearranging