changed views in subtopics
solved merge conflict in subtopic view
Merge pull request #68 from nealcpeters/links

Links