updated with streams page
Merge branch 'master' of https://github.com/matthewAURA/mania