some random changes
some changes
settings work
resolved conflicts
Merge branch 'master' into jawwad-4B
search still works
randome shit
merge conflict resolved
updated stuff
changed setter
Merge branch 'jawwad-4B' of github.com:CombustibleLemons/rss-reader into fix-topic-feed-setter
adding a feed from results works
Merge branch 'jawwad-4B' of github.com:CombustibleLemons/rss-reader into fix-topic-feed-setter
Fixed M2M validation problem
Changed error to 409 instead of 400
Changed location of error message
Merge pull request #56 from CombustibleLemons/fix-topic-feed-setter

Fix topic feed setter