added migration for resources
resolved conflicts pulling in master;
cleaned up gemfile - just formatting
added config/environment settings per https://devcenter.heroku.com/articles/paperclip-s3
done for the night, not working on development
resolved merge conflicts
added quiet assets, removed default url from model
merging with master, resolving conflicts
created paperclip initializer
added image upload capability to roadmaps
added category icons to random roadmap divs
add skill and category to roadmap show
added category icon url to seed data
deleted unnecessary migration file
fixed merge conflicts
merged conflicts
updated to origin master
merging conflicts
adding schema update from ashleys
resolved merge conflict in gemfile