just for me
working on html
Merge remote-tracking branch 'upstream/dev'
Basic subscriptions page working, now on to the popup and other necessities. Currently a bug where tabs add on to the end of current html instead of replacing.
Merge pull request #55 from ShadowSam/master

Basic subscriptions page working minus the actual data displaying on the page and a bug which makes tabs add on to each other rather than replace