removed old html examples
deleted a junk file?
Merge branch 'master' into devon-milestone-4B
Merge branch 'master' into devon-milestone-4B
added some to what is implemented, more acceptance tests
Merge branch 'master' of https://github.com/CombustibleLemons/rss-reader
THE JAVASCRIPT TESTS LIVE AGAIN! *Gargoyles theme starts playing*
Merge branch 'master' into devon-milestone-4B
merge successful, fixed some formatting
more acceptance tests, some stuff for implemented
Merge pull request #66 from CombustibleLemons/devon-milestone-4B

JS Tests Work Again
no edit or delete option for uncategorized
added icons and now you can't edit or delete the uncategorized topic
Merge pull request #67 from CombustibleLemons/jawwad-design

Jawwad design
fixed the shit devon mentioned
cannot rename topic to empty string now
Merge pull request #68 from CombustibleLemons/jawwad-fix-edit-topic

Jawwad fix edit topic
Added plus icon
Merge pull request #69 from CombustibleLemons/jawwad-add-icon

Added plus icon
Merge branch 'master' of https://github.com/CombustibleLemons/rss-reader