added paperclip and aws gems
merge and rebase on feature
added image attachment to categories model
image upload working on roadmaps
;
fixed merge conflicts
Merge pull request #10 from mbetts7/paperclip

Remember to install imagemagick on your machine