Replaced #'s with routes
Resolved index merge conflict
Merge pull request #18 from nairys/View_Links

View links