Replacing justyn file with michelle file for tests
Committing before merging
Rebasing and such
Commiting before merging, again
Committing and pushing current status
Merge branch 'master' into devon-milestone-3B
partway through controller tests, committing for James
Justyn is going to make some edits
Fixed creation of TopicController
merging Justyn's fix
Finalizing merge with Justyn's stuff
adding before merge
Merge branch 'devon-milestone-3B'