Merge remote-tracking branch 'upstream/master'
Replace the category image with the hover image when clicked
Fixed merge conflict
Merge pull request #4 from markprotas/master

Fix the category image when clicked.