Merge pull request #25 from SunJieMing/master

Added image selection for product view.
Merge pull request #26 from SunJieMing/master

Dynamically added data for category views.
changes to navbar and main text
category image, footer, main styles
Merge pull request #27 from ryanleeallred/master

Pull Ryan's Stuff
Fixed merge conflict.
Merge branch 'master' of https://github.com/SunJieMing/unearthedJewelry

Conflicts:
	app/views/category/category.css
	app/views/category/category.html