Fixed merge conflict on Index page
Merge branch 'master' of https://github.com/discotroll65/mouse_hunter

Fixed merge conflicts on politicians index page