Added proper linking between pages for viewing and editing exercise entries
Resolved merge conflict in encyclopedia.ejs