Modified styling for category page.
Fixed merge conflict.
Merge branch 'master' of https://github.com/SunJieMing/unearthedJewelry

Conflicts:
	app/views/category/category.css
	app/views/category/category.html
Merge pull request #28 from SunJieMing/master

Modified styling for category page.
commits category.html
changes gruntfile back