Committing before merging
Merge branch 'master' into devon-milestone-4A
addFeedToTopic and removeFeedFromTopic should both now update locally rather than harassing the server about it
Merge branch 'master' into devon-milestone-4A
I don't remember exactly to be honest
Merge pull request #34 from CombustibleLemons/devon-milestone-4A

Devon milestone 4 a resolves #26