Made buttons for the page "report of both"
Made buttons for the page "report of both"
Merge remote-tracking branch 'origin/master'