Tweaked controller and topics partial, basing them off of our topics class variable
resolved merge conflict
Merge pull request #17 from fox-squirrels-2013/topics-addition

Topics addition