changed images
fixed merge conflicts
removed comments from gemfile

removed category description as required
Merge pull request #58 from ianderse/jessica

front end items and clean up